commit | 6d3e7ebf9ac664aabf31582e3c88b042c7ee3e2f | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 20 21:21:22 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 21:21:22 2014 +0000 |
tree | 34bf7b0d05be2652a4673f445fac0b94381db39b | |
parent | 6adbd880fcbdd7de70b7e21b0c6a64e8dd3e988b [diff] | |
parent | 461fe20331dcb8437f284429d3d53cea8159bc6e [diff] |
am 7c2c5cc9: (-s ours) am 69911348: (-s ours) am 4ce0199e: (-s ours) am 8bf6bc2a: (-s ours) Import translations. DO NOT MERGE * commit '7c2c5cc9bc6127e05715d678bc46f27b43e5ca66': Import translations. DO NOT MERGE