tree f16027c118b17ff680750d876012b663b5b2fe2d
parent 1d1d42a2c145b940d86d8d3c7ef679055d72541d
parent 98f5af661779164a4ff277d29c91831ef2938a88
author Geoff Mendal <mendal@google.com> 1436998700 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436998700 +0000

am 98f5af66: (-s ours) am 7262e3ae: (-s ours) am d2397fbc: (-s ours) Import translations. DO NOT MERGE

* commit '98f5af661779164a4ff277d29c91831ef2938a88':
  Import translations. DO NOT MERGE