tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent c1ed7f3b4b12c583e65e6cde607f7547ee6510f8
parent 415c34b93ca572be42eeef2d4c2efba53c92a74e
author Baligh Uddin <baligh@google.com> 1387467101 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387467101 -0800

am 415c34b9: (-s ours) Import translations. DO NOT MERGE

* commit '415c34b93ca572be42eeef2d4c2efba53c92a74e':
  Import translations. DO NOT MERGE