tree f27d1abd8bb6e57306bcc632ae09606a9cbc166d
parent ad00b3137a9c982030caf42ec48fb828b40b2e19
parent 9b21c8e7d514cd96e303d09a7387e34d08062bb1
author Geoff Mendal <mendal@google.com> 1438006812 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438006812 +0000

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

* commit '9b21c8e7d514cd96e303d09a7387e34d08062bb1':
  Import translations. DO NOT MERGE