tree 693a938d06c7cc9157dab1d9bc88ca7dc243905d
parent 9edf7a1159b528afa056e0d61ee4487ed310fe4c
parent 08394af265b02db7a76c4f4f4ae16b9d238e7580
author Baligh Uddin <baligh@google.com> 1392919577 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392919577 +0000

am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '08394af265b02db7a76c4f4f4ae16b9d238e7580':
  Import translations. DO NOT MERGE