tree be1e95f3c6558b5feec776c257f0a8a0141f7058
parent 839c662747058d2b1ca765b9daf6c73686468888
parent cf2b3aea7738e1d47cacc2203ec6a5ffa8862602
author Geoff Mendal <mendal@google.com> 1436977527 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436977527 +0000

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

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