tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent bfb285b47fb81affd33f31a937734a1704efc72a
parent 61677b41eb12afd0d6950771d5a18f1d33e339be
author Geoff Mendal <mendal@google.com> 1422669651 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669651 +0000

am 61677b41: (-s ours) am 1bcebeae: (-s ours) Import translations. DO NOT MERGE

* commit '61677b41eb12afd0d6950771d5a18f1d33e339be':
  Import translations. DO NOT MERGE