commit | 3673604318ad7ab198de3734ad0a470a4c37c64e | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Dec 04 20:25:06 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 20:25:06 2014 +0000 |
tree | cb9b38f4ec6b5fc5db5a777afba704e34280cddd | |
parent | cda454348d18c413dea586c047a471248a544940 [diff] | |
parent | a7f905f0f23fadc120eff1e7f167f3ee4c76e043 [diff] |
am a7f905f0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'a7f905f0f23fadc120eff1e7f167f3ee4c76e043': Import translations. DO NOT MERGE