commit | c4549ebd380e95374acde8c5b8c37f0f5e756c1a | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 14 13:32:07 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 13:32:07 2015 +0000 |
tree | 0f550deef429add26bf3259e5fae393cdb6e3048 | |
parent | 6668b006b1001d935a5df73dc838b9e12a5dfda2 [diff] | |
parent | cfec547a42db55ba7c7c88d959f7f9f249ca0661 [diff] |
am cfec547a: (-s ours) am dbad1a72: (-s ours) am 341e4d23: (-s ours) Import translations. DO NOT MERGE * commit 'cfec547a42db55ba7c7c88d959f7f9f249ca0661': Import translations. DO NOT MERGE