tree a939177fbfb10e7475ab824b745cc600aae2950b
parent f70a7d304e72e8dbdcaedea21eb1cb8af63783e3
parent b1294d1254e9cbf3e6342cf42690066b4d616046
author Geoff Mendal <mendal@google.com> 1418083651 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418083651 +0000

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

* commit 'b1294d1254e9cbf3e6342cf42690066b4d616046':
  Import translations. DO NOT MERGE