tree a21e04a0987c1159fb51bbdc327e840910e14d51
parent 1726fdea5c723b5729c9af3785a92dd97ae15b5f
parent 963575a864707e2ea40429ea1758815508057692
author Baligh Uddin <baligh@google.com> 1358208625 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358208625 -0800

am 963575a8: (-s ours) Import translations. DO NOT MERGE

* commit '963575a864707e2ea40429ea1758815508057692':
  Import translations. DO NOT MERGE