tree 8d00cedb5fade5c5a70fce2ca0112192b6f20a11
parent 7c584445c197955ea3d2cfddddaa9df9f7939026
parent 181c2f3922855bbe11a603569fa0a74018a53214
author Baligh Uddin <baligh@google.com> 1382046046 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382046046 -0700

am 181c2f39: (-s ours) am 75ee6c53: (-s ours) am 6cf7adc9: (-s ours) Import translations. DO NOT MERGE

* commit '181c2f3922855bbe11a603569fa0a74018a53214':
  Import translations. DO NOT MERGE