| commit | 0664b7a226f42b1301a9b3fa8d27b43df0bc4988 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 22:04:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 22:04:10 2015 +0000 |
| tree | c66f08f0ccc6713ed31b9b2d2d948c925cbb2c27 | |
| parent | aa70cdabc8f1fda88c239b25d00da9e400cc1570 [diff] | |
| parent | 3246f8743a64531f84eb2755dbd7a053b37fe0c0 [diff] |
am 3246f874: (-s ours) am 71daa297: (-s ours) am cd4919b8: (-s ours) Import translations. DO NOT MERGE * commit '3246f8743a64531f84eb2755dbd7a053b37fe0c0':