| commit | f4d2a6a9d9ddbbea5972f0b4a0934d1ebd368d28 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 31 02:52:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 31 02:52:57 2015 +0000 |
| tree | da5c884b7e0833d4a0d780406f112cb55d085647 | |
| parent | 1882e151d8c29f300df543df3dc4c708d0dbcca0 [diff] | |
| parent | 9eb208829832a6f536912169114695f6fd85a55b [diff] |
am 9eb20882: (-s ours) am 84ddee2e: (-s ours) Import translations. DO NOT MERGE * commit '9eb208829832a6f536912169114695f6fd85a55b': Import translations. DO NOT MERGE