commit | 57f2e6ab6efc2e7cac1a8e52cfcb0b5f2331973c | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:40:18 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:40:18 2015 +0000 |
tree | 8c3608027aad02059228f84c658d8a9bac6c7987 | |
parent | 1e873ff319439f583c0ebe619a6944adedde0ffc [diff] | |
parent | c8b271f226c311c2ae37713a0497ef2ad45a79af [diff] |
am c8b271f2: (-s ours) am e1ec89cc: (-s ours) am 809d6c96: (-s ours) am a4d171f3: (-s ours) am 76d7877c: (-s ours) Import translations. DO NOT MERGE * commit 'c8b271f226c311c2ae37713a0497ef2ad45a79af': Import translations. DO NOT MERGE