tree 4512bce02adae0a8fdcbc22814aeda9fd90f7b00
parent f0257dd566a1c8c8d27bd64d24735f554e0221e5
parent c7cdc43ef3f3fb7799dbf2fc68be96c70cdc422c
author Baligh Uddin <baligh@google.com> 1392411770 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411770 +0000

am c7cdc43e: (-s ours) am 72af7f8d: (-s ours) am 72b4c7c3: (-s ours) am 3e6b26da: (-s ours) am cff2d6a2: (-s ours) Import translations. DO NOT MERGE

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