tree 8c799832db933bbd7dacf38798ce3152415b7044
parent c52a78cba9ea666a0a91c372943862cbfdd35caf
parent 8c30c2ce74427677a0d1b83f686da4c7f0fe9f46
author Baligh Uddin <baligh@google.com> 1395766491 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395766491 +0000

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

* commit '8c30c2ce74427677a0d1b83f686da4c7f0fe9f46':
  Import translations. DO NOT MERGE