tree 6a34028e09b9b2af7a10fae30ff3fba13914eb86
parent 8900aac992da58b091701efbe1e833fb6dc7c279
parent d1548f3f1013d81e1dba90326413be3313a313e7
author Geoff Mendal <mendal@google.com> 1440686597 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440686597 +0000

am d1548f3f: (-s ours) am 91f68386: (-s ours) am f5766c04: (-s ours) Import translations. DO NOT MERGE

* commit 'd1548f3f1013d81e1dba90326413be3313a313e7':