tree 86915529e790eecb35ee2312512153b850fe8774
parent eb4a8106adef64da9aa28a4e465be67627235104
parent e790dfdc4f46983b8416ef39b6112e91c10f9b51
author Geoff Mendal <mendal@google.com> 1414473104 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414473104 +0000

am e790dfdc: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-queens

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