commit | 9d3aeeb90601848d8f22fa54fb42bd8cfee2311d | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:48:10 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:48:10 2015 +0000 |
tree | 06272aae20026a09fcc5b0f95d271d2999f3d1a3 | |
parent | 488fedca3879ad1fdff36ecf7ac8750e21af3b08 [diff] | |
parent | 6a694a1bad8bf2e1a586dcc6767a6bead3987a93 [diff] |
am 6a694a1b: (-s ours) Import translations. DO NOT MERGE * commit '6a694a1bad8bf2e1a586dcc6767a6bead3987a93': Import translations. DO NOT MERGE