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