tree 37c07187be6361dda89745d484284525b79b9f61
parent cf66f383688056ae6a9f9887b8ceecb9c4c8a20d
parent 7262e3ae08691c336b46ea3fd2e2bd23e47bef8e
author Geoff Mendal <mendal@google.com> 1436997593 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436997593 +0000

am 7262e3ae: (-s ours) am d2397fbc: (-s ours) Import translations. DO NOT MERGE

* commit '7262e3ae08691c336b46ea3fd2e2bd23e47bef8e':
  Import translations. DO NOT MERGE