commit | 346cb24d05f189b3017912e6104feaadd7411203 | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Sat Jan 29 08:53:01 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 29 08:53:01 2011 -0800 |
tree | 9602ff211d810fa3e5c23912c10f6f20eb0746a3 | |
parent | 52d3320815f3f4ac787c190c0b9f854a61d24b21 [diff] | |
parent | 4876c29f48dda11a2fd13d9a61050783565e7595 [diff] |
am 4876c29f: (-s ours) am 145643ca: (-s ours) am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread * commit '4876c29f48dda11a2fd13d9a61050783565e7595': Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]