tree e82b1665215d015fe56ee8d9f7b4af400aca290f
parent 39a79102f54fd7861032e013a3da9d36eb339246
parent c9963be5fa2accb7779afec6cf7bb7aa4c713932
author Geoff Mendal <mendal@google.com> 1430315577 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430315577 +0000

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

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