commit | c8b271f226c311c2ae37713a0497ef2ad45a79af | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:25:52 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:25:52 2015 +0000 |
tree | ed74a6aa91f56ea4fbffc4e927c715b2e5f8c910 | |
parent | 6472c1897db729b8484dfe3fa3cbe2ea729d29b3 [diff] | |
parent | e1ec89cc18287c8ae1ba2f540e4d436679758f11 [diff] |
am e1ec89cc: (-s ours) am 809d6c96: (-s ours) am a4d171f3: (-s ours) am 76d7877c: (-s ours) Import translations. DO NOT MERGE * commit 'e1ec89cc18287c8ae1ba2f540e4d436679758f11': Import translations. DO NOT MERGE