tree 31fdca54115a40f8f1ed384c000795b9316360ea
parent 214c250354166ee783aef2ed69aa678880995f46
parent ed95cabf4cd13febec213ad342d947c7c847180c
author Baligh Uddin <baligh@google.com> 1384982180 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384982180 -0800

am ed95cabf: (-s ours) am bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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