commit | 01de98ff05939e669b6ec1826a80c88555130a97 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Aug 24 14:29:56 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 14:29:56 2015 +0000 |
tree | 4528070b3ca1338cf39a7dd10e9eff7c8607aa4b | |
parent | 994729ad1048bac9e036375cd1ff361f72966dca [diff] | |
parent | 6e953488181ab21ff1638bd18a05b87b234c3ceb [diff] |
am 6e953488: (-s ours) Import translations. DO NOT MERGE * commit '6e953488181ab21ff1638bd18a05b87b234c3ceb': Import translations. DO NOT MERGE