tree 9a09f49b0bde28e77a26a63c197ee917c45f3d5c
parent e4f2fa7e111d567087a296ee3dc166cc2b74f5af
parent 6c2e00663442641a6bc28f4b319b6e57c86f8f77
author Geoff Mendal <mendal@google.com> 1413799372 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413799372 +0000

am 6c2e0066: (-s ours) Import translations. DO NOT MERGE

* commit '6c2e00663442641a6bc28f4b319b6e57c86f8f77':
  Import translations. DO NOT MERGE