tree 5465daae912e45f8fedaaf6b36ca7ae78efa39da
parent 25aaf785a738ed06692e140c49df4fc59ab5d3ef
parent 092656988fa7ead4196a9e0f118db8a898e49091
author Geoff Mendal <mendal@google.com> 1433025745 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433025745 +0000

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

* commit '092656988fa7ead4196a9e0f118db8a898e49091':
  Import translations. DO NOT MERGE