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