| commit | bf9b9b1e44ef0edfa0f325ee8141f9a09111cbc6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 14:45:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 14:45:55 2015 +0000 |
| tree | 10e6b2c3de02f82757b1a07b2ab7070d92d0c9a7 | |
| parent | f35e93446d5172446fa2cf37cac405a62cd54233 [diff] | |
| parent | 7b2319d016ecc32ca42819a0f6caa62a9681d137 [diff] |
am 7b2319d0: (-s ours) am c0fa470d: (-s ours) Import translations. DO NOT MERGE * commit '7b2319d016ecc32ca42819a0f6caa62a9681d137': Import translations. DO NOT MERGE