tree 1e5fe2ba68ee8dbb53124b6a403f7b9039adb0e5
parent eaba3f1fe43e67a5b3c165fab464753024066f73
parent 7f54d194b3ebb99e2c3904e617415e213f2177da
author Baligh Uddin <baligh@google.com> 1384405435 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384405435 -0800

am 7f54d194: (-s ours) am 56faf220: (-s ours) Import translations. DO NOT MERGE

* commit '7f54d194b3ebb99e2c3904e617415e213f2177da':
  Import translations. DO NOT MERGE