tree dd0035d53ff4021808382ac83615d798321a32d6
parent 34afc2cd83d00be344521b7154a96a84af11c46b
parent 226e57563c3110aa688fc41f10b7a96cd21b6231
author Jim Miller <jaggies@google.com> 1296181512 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296181512 -0800

am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread

* commit '226e57563c3110aa688fc41f10b7a96cd21b6231':
  Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]