tree 4e0072a7ee5cc9bb1ef0e59e657a0953c12a1481
parent ad48c4c9c194d66dcc96e74e906825ca7b550e24
parent 08c21adc91058e97ee6761cfd3a250b64f567d39
author Geoff Mendal <mendal@google.com> 1428746340 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428746340 +0000

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

* commit '08c21adc91058e97ee6761cfd3a250b64f567d39':
  Import translations. DO NOT MERGE