commit | a2e84da9cc287a3cae40641dde1fff46d343b933 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Sep 12 19:46:37 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 19:46:37 2014 +0000 |
tree | 19c706d00e36bd535e2403e33139296b56581fc3 | |
parent | faa13e829080620a4a86788f242ca578b404aac2 [diff] | |
parent | 6297897fccf4628d83e206f0f75131b928eec529 [diff] |
am 6297897f: (-s ours) am 468daeb7: (-s ours) am 8aa54301: (-s ours) am 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6297897fccf4628d83e206f0f75131b928eec529': Import translations. DO NOT MERGE