commit | 6d081cbe398e849700c569a9fe0faa202680e9e5 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Sat Aug 29 22:53:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 29 22:53:14 2015 +0000 |
tree | a5dfa9d1f9fd23340911dd5dd9a26067ef5f6915 | |
parent | 348cc4d753752d00225fc2de702f84be5f28f992 [diff] | |
parent | 467219b92402b2fc94bc277caaed9fa3c9b3b2d5 [diff] |
am 467219b9: (-s ours) am 44b49aef: (-s ours) Import translations. DO NOT MERGE * commit '467219b92402b2fc94bc277caaed9fa3c9b3b2d5': Import translations. DO NOT MERGE