tree ed25d95184eaaa7a2e20a50f00bdec65ca105a11
parent 3111f33533783464d7f1aa428963b8380bdf6231
parent 72b4c7c3df6be428e543c2a28f9b325e0e6d9f2b
author Baligh Uddin <baligh@google.com> 1388116503 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1388116503 -0800

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

* commit '72b4c7c3df6be428e543c2a28f9b325e0e6d9f2b':
  Import translations. DO NOT MERGE