am 9335d414: am 778f1e65: Merge change Icfc893d2 into eclair

Merge commit '9335d414bd2af5bb1ad74459de165a3d93a9ca7b' into eclair-mr2-plus-aosp

* commit '9335d414bd2af5bb1ad74459de165a3d93a9ca7b':
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
This commit is contained in:
Amith Yamasani
2009-11-18 13:15:55 -08:00
committed by Android Git Automerger

View File

@@ -57,7 +57,7 @@ public final class BatteryStatsImpl extends BatteryStats {
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
private static final int VERSION = 41;
private static final int VERSION = 42;
private static int sNumSpeedSteps;