tree 8924d31ff2ecb8b544ab35dab62f515aac397156
parent 2c46c6da07d961d55a742140454e028607ffa011
parent a5f1be6fe174676db1ae50c18d43b19361e5858f
author Geoff Mendal <mendal@google.com> 1440674490 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674490 +0000

am a5f1be6f: (-s ours) am 97e3b5fc: (-s ours) Import translations. DO NOT MERGE

* commit 'a5f1be6fe174676db1ae50c18d43b19361e5858f':