| commit | c53a1e975f6681d02cec60b132e635dc1438ef20 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 14:12:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 14:12:18 2015 +0000 |
| tree | 4333f3952a6713e6392218d20fd2744054dfb65f | |
| parent | 69b885f44172964ad301d5128975a5c73e275ea4 [diff] | |
| parent | e8698ed9ab498a134f8ed10e2adb3c8fcc05e2ae [diff] |
am e8698ed9: (-s ours) am 2ec874c6: (-s ours) am 9a44cab5: (-s ours) am 6288a329: (-s ours) Import translations. DO NOT MERGE * commit 'e8698ed9ab498a134f8ed10e2adb3c8fcc05e2ae': Import translations. DO NOT MERGE