tree 6b1e919825a70663c5a43f54f9aee99e88eec354
parent fb7827f3be33a0d2cc5a3ee113327b4c40a7cef1
parent 79670bbe68dbc6c6cc1da9f1d093dabb8099e7f5
author Geoff Mendal <mendal@google.com> 1430213773 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430213773 +0000

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

* commit '79670bbe68dbc6c6cc1da9f1d093dabb8099e7f5':
  Import translations. DO NOT MERGE