tree 9eb79b70c53686971f52662b8104cb49a86ea020
parent bf8c4f8878a4f827f968c10ef6d38aa1c93a0370
parent 13298ce574687cf53def7f1d545b304643b2dba6
author Geoff Mendal <mendal@google.com> 1436803365 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436803365 +0000

am 13298ce5: (-s ours) am f23cedb1: (-s ours) am 74ce6205: (-s ours) am 8d928c77: (-s ours) Import translations. DO NOT MERGE

* commit '13298ce574687cf53def7f1d545b304643b2dba6':
  Import translations. DO NOT MERGE