commit | db5b94d4050c169cf1c41aca8af83b1c0225c037 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Oct 09 00:13:25 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 09 00:13:25 2014 +0000 |
tree | c90ccc07dc538da700c370909d57a509b4fc5867 | |
parent | 49e2371a271e33bbe8177c3f87d5f3b8ef7f59c5 [diff] | |
parent | f121892bc8c73b06086f8ebc059dd86f680b5197 [diff] |
am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f121892bc8c73b06086f8ebc059dd86f680b5197': Import translations. DO NOT MERGE