tree c2175942e3a631ad112fe6ab17da560c45fc1ae2
parent 425c3c3983cddb32a7562453522e8f91b96a6d2e
parent 7f4fa817f71a2f071221950003d6ed4480be482e
author Baligh Uddin <baligh@google.com> 1400026055 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400026055 +0000

am 7f4fa817: (-s ours) am 0c066cc3: (-s ours) am cd96200a: (-s ours) am ace17549: (-s ours) am c1f2a213: (-s ours) am ea8ec3cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '7f4fa817f71a2f071221950003d6ed4480be482e':