tree 475e1410a34abbfd6520fb285ab2700eb2e2820c
parent 6a8b169118e4c3df80a800f28f32ad9ec61260ce
parent 32aa82223a5e0e5475df81378d0e6715601b2cc2
author Baligh Uddin <baligh@google.com> 1386798726 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386798726 -0800

am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '32aa82223a5e0e5475df81378d0e6715601b2cc2':
  Import translations. DO NOT MERGE