tree 3d1ebd2e7ee6bc940ecf491b9f397f2a406a24ab
parent c1a60fcbcbcd4ae725f51e299bd01c1fa5f0c110
parent daf2f8332cf3b142a50d9e16f1c6f807afe02171
author Geoff Mendal <mendal@google.com> 1431531513 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431531513 +0000

am daf2f833: (-s ours) am cd322355: (-s ours) am e4aa1150: (-s ours) Import translations. DO NOT MERGE

* commit 'daf2f8332cf3b142a50d9e16f1c6f807afe02171':
  Import translations. DO NOT MERGE