tree 0885cf94b6d919f4a2aa8e0c4c5f05e665642a23
parent 03668e91d0a96ba9468e275b4543f9612874ba3e
parent 045febc1e156f329b7bdfd5e5c9e3f3d4c4ef227
author Baligh Uddin <baligh@google.com> 1358524332 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358524332 -0800

am 045febc1: (-s ours) am 1f8fa93a: am 15188b34: Import translations. DO NOT MERGE

* commit '045febc1e156f329b7bdfd5e5c9e3f3d4c4ef227':
  Import translations. DO NOT MERGE