tree 372aa2b4d785acc4d7e54488d648037f98491fa9
parent 3fb3408b2ecdd601e93a2675ef0f81b15334ed0a
parent 3437d9e716e477d407dfc13cc797500e6421e464
author Geoff Mendal <mendal@google.com> 1426511687 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426511687 +0000

am 3437d9e7: (-s ours) am 57d39a3d: (-s ours) Import translations. DO NOT MERGE

* commit '3437d9e716e477d407dfc13cc797500e6421e464':
  Import translations. DO NOT MERGE