tree b2099f54f527daf937f8be0e6f7a414473837890
parent 73a950602aa1bb90bbde92ddc9e5e0956f8f1124
parent 6ab691b69ea9bc879c7ff854b5eb4f49cf0c864c
author Geoff Mendal <mendal@google.com> 1395089234 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395089234 +0000

am 6ab691b6: (-s ours) am f57c1564: (-s ours) Import translations. DO NOT MERGE

* commit '6ab691b69ea9bc879c7ff854b5eb4f49cf0c864c':
  Import translations. DO NOT MERGE