tree e7155c7ab84d8c149fc3fab9b49bd86413771acf
parent 6695fa52994fcf43f80cf5142eeacd37d5a6094d
parent 41c2f04e2a7f48c88f59e91d4b2b130dbfb2fce5
author Baligh Uddin <baligh@google.com> 1383796817 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383796817 -0800

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

* commit '41c2f04e2a7f48c88f59e91d4b2b130dbfb2fce5':
  Import translations. DO NOT MERGE