tree 8e13a09ecb7172c50fb734794b84e634b8af9eaa
parent 718caf8148058848b533cf3bdc35b6b51365e79e
parent af72dc5b484ea510b9ffc3229de1707d55f68a5a
author Geoff Mendal <mendal@google.com> 1431575150 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431575150 +0000

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

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