| commit | 7012f94d9b530c51bf2e40732c0527afb1212bcf | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 19:22:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 19:22:17 2014 +0000 |
| tree | c26f1df0f36fd5262a833f5f80492aaf71d8c6ef | |
| parent | 37a0efd8fb5854bfb013db039008160f04269897 [diff] | |
| parent | ff4300e39752693a7c0b45cdf757987a7b725677 [diff] |
am a04e271b: (-s ours) am 7e57c779: (-s ours) Import translations. DO NOT MERGE * commit 'a04e271b908cbe2a281ec97c98c58b35538e3aed': Import translations. DO NOT MERGE