| commit | 6912dc5f33e152e3a0d6b8561dcf8cbcd5a4056c | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Oct 19 22:37:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 19 22:37:17 2014 +0000 |
| tree | 12534000ff0e4eda41742040b9324d6e435a9d0b | |
| parent | 2d6832d8ff823372f4bf2ebc31ac71263b3a4320 [diff] | |
| parent | ffd0f4d5e753c936455a7bedd6c6d83912ce6ae0 [diff] |
am ffd0f4d5: (-s ours) am 6f1de7e5: (-s ours) am cf1c95ec: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'ffd0f4d5e753c936455a7bedd6c6d83912ce6ae0': Import translations. DO NOT MERGE