commit | e04a4b509b7b057e6ad012562c3970648eb971c3 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Fri Jul 24 03:02:36 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 03:02:36 2015 +0000 |
tree | b3b77ef9e75baeb8c70412e3ad406c1ddc91e8ff | |
parent | 4c0d05b7d99b5135fc1fd99552e128ddd14b1b8d [diff] | |
parent | b7d77afc5951d21f6b36f0b43f3630c9294e46c6 [diff] |
am b7d77afc: (-s ours) am a8f551b5: (-s ours) Import translations. DO NOT MERGE * commit 'b7d77afc5951d21f6b36f0b43f3630c9294e46c6': Import translations. DO NOT MERGE