tree 8ac9ab9e0e81d50cc2983f39f5fdbf362cd9fd4e
parent ffeb2959e177a7f94321ca9ca3b3e55726fd7df2
parent db90beee62e1b0cb2d306acdb8e0602d31349ed5
author Geoff Mendal <mendal@google.com> 1438006034 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438006034 +0000

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

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