tree 015c543c3bce81fd545d29297de9d3a47d58538f
parent 684d488ab44004dc166de8b2ceec466e47b98dd5
parent 1dc93acf3a4a7cf9ede43e5d2d03fc5c7ff8071e
author Baligh Uddin <baligh@google.com> 1384801237 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384801237 -0800

am 1dc93acf: (-s ours) am 4dee4e1c: (-s ours) am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '1dc93acf3a4a7cf9ede43e5d2d03fc5c7ff8071e':
  Import translations. DO NOT MERGE