tree 575d824d21f2944f05b1b59ec614a4afcd2c3f6f
parent 9021187407a5d719327c9729c27f7d19be2263d0
parent 2e2d63e766c548ad442d478cb9a3a0f5c0488a7c
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