tree 42e84ec696585fbedc1133ed654a9a57e34f8967
parent 6d23e5ae5a9edf8b63b650c719dacf305e046bf2
parent 5e0def615cb6b66cfe03ec60732240b0a3636227
author Geoff Mendal <mendal@google.com> 1440711530 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440711530 +0000

am 5e0def61: (-s ours) am 8dc4e710: (-s ours) am a5698f20: (-s ours) Import translations. DO NOT MERGE

* commit '5e0def615cb6b66cfe03ec60732240b0a3636227':