tree c7ff7828d5e23794bb83c8be0e82c1129ccf33df
parent 2b8eea15b029b5d8427f3569e8cbf90ffb5cb7db
parent 58afc3547e1b05175153a20d8d340ce3ee97ba7d
author Geoff Mendal <mendal@google.com> 1424993141 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424993141 +0000

am 58afc354: (-s ours) am 729ad90f: (-s ours) Import translations. DO NOT MERGE

* commit '58afc3547e1b05175153a20d8d340ce3ee97ba7d':
  Import translations. DO NOT MERGE