tree 54ec2a9f83d52bec69333b287429b91912ad9de7
parent f5eae785559a775b804dcb3e3ce1fac14275e97b
parent 4ebb0071df6adcbad54a3348bf04bdb071e1e6db
author Geoff Mendal <mendal@google.com> 1412775523 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412775523 +0000

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

* commit '4ebb0071df6adcbad54a3348bf04bdb071e1e6db':
  Import translations. DO NOT MERGE