tree 122703526314e3ed4c2ba6f740ad0433dbd676bf
parent ab0c43a4581d5b34ea9590cad4495447aa536942
parent b285604185de1ade346eadb78971712607f54058
author Baligh Uddin <baligh@google.com> 1396621855 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396621855 +0000

am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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