tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 42de0037776d933455f27a461abd29ce39a2e77d
parent f9f10d03de653910287a3a44cc264889a634c535
author Baligh Uddin <baligh@google.com> 1382471993 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382471993 -0700

am f9f10d03: (-s ours) am 24081d3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'f9f10d03de653910287a3a44cc264889a634c535':
  Import translations. DO NOT MERGE