tree 4a978a7a292ee81b231e6fb55e214f23efb5d067
parent 9a9367fb6f029640de85cc49825b2eadabc76a00
parent 040b85595066ff9d3280e3fe4d711542264e6efb
author Geoff Mendal <mendal@google.com> 1436979745 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436979745 +0000

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

* commit '040b85595066ff9d3280e3fe4d711542264e6efb':
  Import translations. DO NOT MERGE