commit | 5a2b966ac490e59d0285934ac652dbaa02764f6b | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Feb 12 23:05:28 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 23:05:28 2015 +0000 |
tree | ce7cec99f0dd32e67464e93a42927f9da159c155 | |
parent | cd15d99721b514d6b104302217805ded5e194e43 [diff] | |
parent | e22cd0f9e6da18fe6827a481774e2998efbb5f46 [diff] |
am e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit 'e22cd0f9e6da18fe6827a481774e2998efbb5f46': Import translations. DO NOT MERGE