commit | 1f76ef0e71b7c86d6b6582e67152a72e91108356 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue Sep 16 18:03:56 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 18:03:56 2014 +0000 |
tree | 611310b3ee31117b436f4a606ac5a9c858e62370 | |
parent | 12e57c5a720ef3f22b690fc65e13dde67e271959 [diff] | |
parent | 6e0e130eb3d1446bcefedac080d970d5c07893f8 [diff] |
am 6e0e130e: (-s ours) am 81c1daa9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6e0e130eb3d1446bcefedac080d970d5c07893f8': Import translations. DO NOT MERGE