| commit | 9c36c2b753dd73bdf3a7d2ca86671df6f4585ab3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:55:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:55:56 2015 +0000 |
| tree | 3f3b53cf7e85e9e7b147ac1892260724a10e778d | |
| parent | 147fe6b6a9c2d9fd751d563499a30d42f5e55bba [diff] | |
| parent | 1bd69ef93c0182206513631c6ac4ecb9b6db1069 [diff] |
am 1bd69ef9: (-s ours) am 1b1a1b6e: (-s ours) am 97fb0bba: (-s ours) Import translations. DO NOT MERGE * commit '1bd69ef93c0182206513631c6ac4ecb9b6db1069': Import translations. DO NOT MERGE