tree e671bd677b3e875f0309e141e4d9830cb46126cf
parent 73726f5b31dc9386ea63db3072a762c17604f6bb
parent 734963ab7f1bee71ce4a1509872bced74668b6f0
author Geoff Mendal <mendal@google.com> 1415029294 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415029294 +0000

am 734963ab: (-s ours) Import translations. DO NOT MERGE

* commit '734963ab7f1bee71ce4a1509872bced74668b6f0':
  Import translations. DO NOT MERGE