tree 50bc6406f12cd58b1eb7e1722cbcff6414e485e6
parent b1294d1254e9cbf3e6342cf42690066b4d616046
parent 51aa2348275231a0b2bbb08c8f512e1502371a46
author Geoff Mendal <mendal@google.com> 1418083699 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418083699 +0000

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

* commit '51aa2348275231a0b2bbb08c8f512e1502371a46':
  Import translations. DO NOT MERGE