tree 72e69a7ae77957f9eecab174a2c5ee45283ce8c7
parent 338cb79cbc478342f51109b85a3fba8743633dd2
parent 626bbd23cf3476af5b52779504a41f36cfc0026b
author Baligh Uddin <baligh@google.com> 1380918853 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380918853 -0700

am 626bbd23: (-s ours) am 5b40f4fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '626bbd23cf3476af5b52779504a41f36cfc0026b':
  Import translations. DO NOT MERGE