| commit | 056ba2a749f1ad9389f0485c1fd159045a96e8d6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 21:18:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:18:15 2015 +0000 |
| tree | 2eef63ba497d1eca5ecb7f026eba42a98093bede | |
| parent | f4a48b946f7d188141184585cb7a1d6926205107 [diff] | |
| parent | b62d31aa84e6d115babb85c61f7ba543bd4546ef [diff] |
am d1083034: (-s ours) am 498d6802: (-s ours) am 34376003: (-s ours) Import translations. DO NOT MERGE * commit 'd10830344cd615eb8a6dbff4af7199e958f3fc4c':