| commit | 3fe962ec7db9966878c37bff2c13b4afa96f076e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 29 22:54:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 22:54:51 2014 +0000 |
| tree | 9d9ccc416500af97459e69695c8ba23c1f7e8897 | |
| parent | f4e3b9346a57097634aa10a7fcff25eefa5afde6 [diff] | |
| parent | ad6ef4b1c6a7bdea722771fc1b4cc6885dbbe0ac [diff] |
am ad6ef4b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'ad6ef4b1c6a7bdea722771fc1b4cc6885dbbe0ac': Import translations. DO NOT MERGE