tree 4ee45334961ab4c79820d37768d0018a091e2564
parent 45ad4f4e6391dfe5c56d9bb6e1d11cc1f1bbdb0e
parent 6164b1666b571905dd313e542ceb9adcaf6e6803
author Baligh Uddin <baligh@google.com> 1384209905 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384209905 -0800

am 6164b166: (-s ours) am 840587b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '6164b1666b571905dd313e542ceb9adcaf6e6803':
  Import translations. DO NOT MERGE