tree c94d4b51e35ac170a8dc0b98a9f02e3b798959f3
parent f05f4ff01ced043832f714d6f841bae33d8cb141
parent fd7a7dc8482de00ab1a34fa23ec8d8e8b4985fe4
author Geoff Mendal <mendal@google.com> 1436800289 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436800289 +0000

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

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