tree 998a6c69cbef03ce7a6beded0ccbdbbfd4d9e8da
parent ba777d99627ed54759c5cef3f1faaee654867b8e
parent 213019578fd2e71bb0a359e98006a5a393580b01
author Geoff Mendal <mendal@google.com> 1434552917 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434552917 +0000

am 21301957: (-s ours) am a118b48b: (-s ours) am 8a4d0c51: (-s ours) Import translations. DO NOT MERGE

* commit '213019578fd2e71bb0a359e98006a5a393580b01':
  Import translations. DO NOT MERGE