| commit | 9ee51713303d132ab157ccfd9499f35d8949b713 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 16 12:56:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 16 12:56:34 2015 +0000 |
| tree | 7ac0f6a7a99944246242a9eee68181e92bad2c9b | |
| parent | 33acb15e032ac65d743b708731004b9a5f7813d5 [diff] | |
| parent | 79e7d1747ffde2a70fc709915c55f6e149d879e4 [diff] |
am 79e7d174: (-s ours) am d1e37422: (-s ours) Import translations. DO NOT MERGE * commit '79e7d1747ffde2a70fc709915c55f6e149d879e4': Import translations. DO NOT MERGE