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