tree 027d946987fb7afbe53e8e67afbf69ada2d61a46
parent 5f164da19bf6e1a7db4860bb876f2caf5f98d0af
parent 1887531593e791c7be3acde694348e2a768930b9
author Geoff Mendal <mendal@google.com> 1423791119 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423791119 +0000

am 18875315: (-s ours) am c3af713c: (-s ours) Import translations. DO NOT MERGE

* commit '1887531593e791c7be3acde694348e2a768930b9':
  Import translations. DO NOT MERGE