tree ba6cab9c2141ca15fa5356cb75199c34180973a6
parent b0f356579eb0348fac7157a6348f1e568556a4db
parent 40a4ab130a3e3c99afb1a57e9aa30de03a89b51e
author Ying Wang <wangying@google.com> 1341948971 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1341948971 -0700

am 40a4ab13: Import translations. DO NOT MERGE

* commit '40a4ab130a3e3c99afb1a57e9aa30de03a89b51e':
  Import translations. DO NOT MERGE