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