| commit | 3246f8743a64531f84eb2755dbd7a053b37fe0c0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 12:17:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:17:49 2015 +0000 |
| tree | 3f3b53cf7e85e9e7b147ac1892260724a10e778d | |
| parent | ad2f8bad93013783ed52d05c4f273547501d4df1 [diff] | |
| parent | 71daa297cdec1e7cfc11957488e75761c88b59a4 [diff] |
am 71daa297: (-s ours) am cd4919b8: (-s ours) Import translations. DO NOT MERGE * commit '71daa297cdec1e7cfc11957488e75761c88b59a4':