tree 1b4eb72c1efbfaca9e9623c976040ecdd208fff5
parent 1faeb11bad847a8cbe69e1b8fb4ab780d346a2f8
parent ee1fa39520d6a7d5326f26b90140ebaf24ce7923
author Geoff Mendal <mendal@google.com> 1435580796 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435580796 +0000

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

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