tree c5749e197e0a81f915aa5c0bc34359a475cfc625
parent 377329db75cc550ed78418c0c6a04a5ac534e5ba
parent 705d808558fd3e165fd787b8628aae7db084e764
author Ying Wang <wangying@google.com> 1340212947 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340212947 -0700

am 705d8085: Import translations. DO NOT MERGE

* commit '705d808558fd3e165fd787b8628aae7db084e764':
  Import translations. DO NOT MERGE