tree 5e39204c545803e78b5938d0e54e0f4af5cfef34
parent b22ed4e378290dedfe588ceae8be236447c72305
parent 56fbd8d86a1ea60ae42185349cf8809df24d262a
author Android (Google) Code Review <android-gerrit@google.com> 1246910280 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1246910280 -0700

am 56fbd8d8: Merge change 6258 into donut

Merge commit '56fbd8d86a1ea60ae42185349cf8809df24d262a'

* commit '56fbd8d86a1ea60ae42185349cf8809df24d262a':
  Fix the comment -- "charged" not "sharted."  Also, the other