commit 9335d414bd2af5bb1ad74459de165a3d93a9ca7b
author Amith Yamasani <yamasani@google.com> Wed Nov 18 13:10:53 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 18 13:10:53 2009 -0800
tree 7ade06d27c9d3a4f828fdaaa943da443ba9130e6
parent 8c7d9eab8aa297f5ee3a171c6fa63fcf94e2b330
parent 778f1e65a5ea37bc4adc4725e281a34b775bc72d

am 778f1e65: Merge change Icfc893d2 into eclair

Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-mr2

* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices

core/java/com/android/internal/os/BatteryStatsImpl.java

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 8698cb7..5199ada 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -57,7 +57,7 @@
     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;