tree a3aaf2d222ef5feebfcca9a81c7548a8964ec8da
parent c0498333d7a836f24ea72934e9d8d118a273b324
parent 1a0e1c0eddcb835620ef884325f7e4f07e3439f7
author Baligh Uddin <baligh@google.com> 1383018709 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383018709 -0700

am 1a0e1c0e: (-s ours) Import translations. DO NOT MERGE

* commit '1a0e1c0eddcb835620ef884325f7e4f07e3439f7':
  Import translations. DO NOT MERGE