| commit | 9e7f4ae8f7da971f135b9ace689a6d9cff0096a7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 03 18:12:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 18:12:21 2015 +0000 |
| tree | ffb03ee4ce1ef9c343acfbade961344c12cc6aa8 | |
| parent | ad146e951ec025440fdef0de627b7d4a697b8f5e [diff] | |
| parent | a267ba3b0b7a2f8bbcc308bc94b9e92986faa333 [diff] |
am a267ba3b: (-s ours) Import translations. DO NOT MERGE * commit 'a267ba3b0b7a2f8bbcc308bc94b9e92986faa333': Import translations. DO NOT MERGE