| commit | 026cbba1f25bae341bd832edbebaa2c60e12c836 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Sep 19 22:56:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 22:56:52 2014 +0000 |
| tree | 0566f173125ffe1aa20ac9b162cd36314c43c502 | |
| parent | 30032b95d815312c1fdfc4c75b616c18385cd990 [diff] | |
| parent | 4e3f5709ad0892d3c8ffe6cbb620000ffe21f640 [diff] |
am 4e3f5709: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '4e3f5709ad0892d3c8ffe6cbb620000ffe21f640': Import translations. DO NOT MERGE