tree d708a0f0d49c62de4ec342904b31173d3a26fc6c
parent f04bf2398aef6c0209226ebe39b55f71fbb91760
parent 04769f324f2945e11bdf35816fe53f385e3ff6fb
author Baligh Uddin <baligh@google.com> 1352153882 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352153882 -0800

am 04769f32: (-s ours) am 8713e74c: am c36184a8: Import translations. DO NOT MERGE

* commit '04769f324f2945e11bdf35816fe53f385e3ff6fb':
  Import translations. DO NOT MERGE