commit | 7eaee10244c5e04cd15d216cecb35205f1e1a3c8 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:44:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:44:46 2014 +0000 |
tree | 37744587460bcc220e4b368c93a844140cf53d02 | |
parent | da5490bae7aa3c261a60f631f54be8c65017af58 [diff] | |
parent | dc00e58048a854e87f7285fc8db14451de8db684 [diff] |
am dc00e580: (-s ours) am b338323e: (-s ours) am 41c5801e: (-s ours) am ee8cbc45: (-s ours) am 36eb99ef: (-s ours) Import translations. DO NOT MERGE * commit 'dc00e58048a854e87f7285fc8db14451de8db684': Import translations. DO NOT MERGE