tree 50528d96f58009b20a56ce829998dd206c8c906c
parent fd4effa07922b5d3bf43166ff0e6a68763bcc85c
parent d2397fbc5985c237b1312f19f26f8a81355ff022
author Geoff Mendal <mendal@google.com> 1436996620 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436996620 +0000

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

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