tree b69477e69c2831ef759f5f44e5793efa2ddcbb25
parent 38224cc4a31f09ba55073bcf7127caf33d108863
parent 56cfcbdd0b0adb33c7ab325022ce8d3698059b60
author Geoff Mendal <mendal@google.com> 1439828775 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439828775 +0000

am 56cfcbdd: (-s ours) am 09365362: (-s ours) am 281907b5: (-s ours) am 3447541c: (-s ours) Import translations. DO NOT MERGE

* commit '56cfcbdd0b0adb33c7ab325022ce8d3698059b60':
  Import translations. DO NOT MERGE