tree 6deb9ed50cf4f187e8209187692b8de680557384
parent 1582895141188a8cb826e7eb441f90c6012f7a68
parent 54b8c327e8b1beab673edc463acc917b0c0571e2
author Eric Fischer <enf@google.com> 1319135523 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319135523 -0700

am 54b8c327: (-s ours) Import revised translations.  DO NOT MERGE

* commit '54b8c327e8b1beab673edc463acc917b0c0571e2':
  Import revised translations.  DO NOT MERGE