tree 31e22746cd36c2f4b87e73c58753b18d63a31669
parent 9b400d81287c5be3c3902edfad17f09e955dbc8b
parent 46f2a32ee196c3e9a0b3328e12f274bfdc8e340d
author Baligh Uddin <baligh@google.com> 1395766930 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395766930 +0000

am 46f2a32e: (-s ours) am 8c30c2ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '46f2a32ee196c3e9a0b3328e12f274bfdc8e340d':
  Import translations. DO NOT MERGE