tree 803763df7f09b075a56c03bcd4296a392e3cc2bb
parent 47c7c34f6445db341f673178f4040e6fcd42ca03
parent bdc55f25032815bd811ee91ae4b6c0362fa67573
author Geoff Mendal <mendal@google.com> 1416420098 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416420098 +0000

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

* commit 'd53aba05a73dee21b6806e763549e18d0eabe9ec':
  Import translations. DO NOT MERGE