tree 0dc27eff56a336ec089f80b4d7ba05cfa93cfffd
parent 6517e67c1bd5381e746ef58ade542f8cee78687f
parent 4f48b435cefa07d722225d74eccfafc0c0091ba8
author Geoff Mendal <mendal@google.com> 1435156010 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435156010 +0000

am 4f48b435: (-s ours) am e042f952: (-s ours) Import translations. DO NOT MERGE

* commit '4f48b435cefa07d722225d74eccfafc0c0091ba8':
  Import translations. DO NOT MERGE