tree bf39e1db7fc92f3744cc3fe9451fe7d7056b00cc
parent 439bc06dc0f96ea8677a897285f81e6b3ee3da47
parent a67ba8612f4408c42bb6988304aeb86bd3382796
author Geoff Mendal <mendal@google.com> 1444250750 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444250750 +0000

am a67ba861: (-s ours) am 53d3be63: (-s ours) Import translations. DO NOT MERGE

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