tree 8924d31ff2ecb8b544ab35dab62f515aac397156
parent dce608ccb7aa4fd63ec7b989838f2d893ebc6f2e
parent e00016647ba74ca76b90c241a56a4c136624a3a6
author Geoff Mendal <mendal@google.com> 1440674462 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674462 +0000

am e0001664: (-s ours) am 2d37dbd0: (-s ours) Import translations. DO NOT MERGE

* commit 'e00016647ba74ca76b90c241a56a4c136624a3a6':