tree 782587a3ae0fe931a61ea175c752c20dae5d092e
parent 699e129c0f3879f2c170984615c2801ef60b0c95
parent 1c316b44e5596ef87654ed67ecd05e4048380498
author Geoff Mendal <mendal@google.com> 1436980408 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436980408 +0000

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

* commit '1c316b44e5596ef87654ed67ecd05e4048380498':
  Import translations. DO NOT MERGE