commit | 844b1532be89e413d2908ea8d26562028940fe6e | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 20 22:27:41 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 22:27:41 2014 +0000 |
tree | 67dc1ea9e29e01567994c637bb82d00c5939e7e3 | |
parent | a7992209d7a9ad43727700d9cf8e4611f618ac2e [diff] | |
parent | 2c3732726a60ff7b1d2b01655aeebfdfc36ea618 [diff] |
am 2c373272: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '2c3732726a60ff7b1d2b01655aeebfdfc36ea618': Import translations. DO NOT MERGE