tree ddaecd511b6aaceb4d63e7da228ece596ab9e845
parent 928c88774db7d89036aef0f4286f7414b3a597f3
parent 7bdc151eecf5cb01af19964c43e99f41069d093d
author Ying Wang <wangying@google.com> 1340833483 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340833483 -0700

am 7bdc151e: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '7bdc151eecf5cb01af19964c43e99f41069d093d':
  Import translations. DO NOT MERGE