| commit | d2a6bd52d650ecfe0b2c39630568b434a82e3ee0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 03 14:50:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 14:50:47 2014 +0000 |
| tree | 2c78f0a3440f79788ede6fcbe2cb838ebd9df8ef | |
| parent | 5c69f5b276b65bd4b8000d2b6e56baddccf89846 [diff] | |
| parent | 7ed62e4e947df28175d71a637d74d590f36dcb24 [diff] |
am 7ed62e4e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '7ed62e4e947df28175d71a637d74d590f36dcb24': Import translations. DO NOT MERGE