| commit | 1bd69ef93c0182206513631c6ac4ecb9b6db1069 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:32:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:32:20 2015 +0000 |
| tree | 08e3dd5170f0b186b89b95c00dfd115e2a458b00 | |
| parent | e0cee3f2504de78b97e4ba4320375cda920c74fa [diff] | |
| parent | 1b1a1b6e77aa08c22cc1547fe45ab84963c97347 [diff] |
am 1b1a1b6e: (-s ours) am 97fb0bba: (-s ours) Import translations. DO NOT MERGE * commit '1b1a1b6e77aa08c22cc1547fe45ab84963c97347': Import translations. DO NOT MERGE