tree d3471e5457d7180986c53211145cadf734c8ad96
parent d2975f9d0c12b46978c2a108961617293eeaba85
parent 51b43e1236fa70711d914d0bc117a1ac745f0172
author Geoff Mendal <mendal@google.com> 1445260388 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445260388 +0000

am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d  -s ours

* commit '51b43e1236fa70711d914d0bc117a1ac745f0172':
  Import translations. DO NOT MERGE