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