tree 4f8c41dcb4818293f008e8eaf4a6b7090bc698da
parent 29be6698f05d0e9b8e7a48bc4e639bde3ca8e171
parent 6bc4577cf49c5b1b0339b9eae788c2d0d36ecd4a
author Geoff Mendal <mendal@google.com> 1413244982 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413244982 +0000

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

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