commit | 10a0dc21bbf73a9bfe01de47007d25c78a0d214e | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:08:42 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:08:42 2015 +0000 |
tree | a33652fdf514807816ce5a7dfe046a84daaa19a3 | |
parent | 6553dd6e7cf2a95b2c3cb7f6e1c322a14bdcd86e [diff] | |
parent | 4d9ee90111837f47a524e479eb161ff52990986d [diff] |
am 4d9ee901: (-s ours) am a5698f20: (-s ours) Import translations. DO NOT MERGE * commit '4d9ee90111837f47a524e479eb161ff52990986d': Import translations. DO NOT MERGE