tree 999ec56c09b7f188e75f6dcb40b3b779a0cb60f2
parent 158ce5ce84e4226118e8e2102cb712cfd77dfb21
parent 6c6e53886a82df478ba89152a55289e461afb5c7
author Geoff Mendal <mendal@google.com> 1438448146 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438448146 +0000

am 6c6e5388: (-s ours) am c9692826: (-s ours) Import translations. DO NOT MERGE

* commit '6c6e53886a82df478ba89152a55289e461afb5c7':
  Import translations. DO NOT MERGE