tree b3f0e72d6ba834774318894099cecdbe7aa5b093
parent a4f261cf232d62a84043103e0f1ccd56e0f1c256
parent 82c0f1c413273ddf6e04412f4502682dc81a6a20
author Geoff Mendal <mendal@google.com> 1444832551 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444832551 +0000

am 82c0f1c4: (-s ours) am 62679a1f: (-s ours) am c095272a: (-s ours) am 7013f0c8: (-s ours) Import translations. DO NOT MERGE

* commit '82c0f1c413273ddf6e04412f4502682dc81a6a20':
  Import translations. DO NOT MERGE