| commit | 2ff95f6fe6cbb99ae68142dc201e1f78f812418d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sun Nov 02 19:21:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 19:21:02 2014 +0000 |
| tree | 6a24ba2c2c8577c111562425e08acbcf9ab3fcfa | |
| parent | 377e12a7891fd3ced5eddfb4af7cac1625c5a165 [diff] | |
| parent | b5bee6f8f6cd83bf3cfc8a5edbd20a2684fd2700 [diff] |
am b5bee6f8: (-s ours) am 2d450dfb: (-s ours) Import translations. DO NOT MERGE * commit 'b5bee6f8f6cd83bf3cfc8a5edbd20a2684fd2700': Import translations. DO NOT MERGE