tree 1a2f9f69674820540d354e52e905eeb43d03713d
parent 13688c8b7e84a2ff8017c33db35559b5d0fb878a
parent 5449f0fdc0fe0eceb106e4d4554cdfe729103f84
author Geoff Mendal <mendal@google.com> 1436969779 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436969779 +0000

am 5449f0fd: (-s ours) am 62f7a266: (-s ours) Import translations. DO NOT MERGE

* commit '5449f0fdc0fe0eceb106e4d4554cdfe729103f84':
  Import translations. DO NOT MERGE