tree a939177fbfb10e7475ab824b745cc600aae2950b
parent ce4fbd8f234f926ca271715726f91fd6ab912f23
parent afe9c4237fcea15374489c3ea6c9e5fb5c4908d8
author Geoff Mendal <mendal@google.com> 1418084598 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418084598 +0000

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

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