summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
diff options
context:
space:
mode:
authorAshish Sharma <ashishsharma@google.com>2015-08-27 23:28:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 23:28:22 +0000
commitffa3d0408f9c3ffb5ab3ee45ef6c466d795fb2c8 (patch)
treeab78dc21f05e7b51c0f8b84ec5a78d7281975c34 /core/java/android/os
parentc07701f2764a1c09dc3e8af4321ff0ef66056fee (diff)
parent3883e72aeda7dcc5f76eba7ad2e95ad2cb041687 (diff)
downloadframeworks_base-ffa3d0408f9c3ffb5ab3ee45ef6c466d795fb2c8.zip
frameworks_base-ffa3d0408f9c3ffb5ab3ee45ef6c466d795fb2c8.tar.gz
frameworks_base-ffa3d0408f9c3ffb5ab3ee45ef6c466d795fb2c8.tar.bz2
am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-dev
* commit '3883e72aeda7dcc5f76eba7ad2e95ad2cb041687': BatteryStats: Bump checkin version
Diffstat (limited to 'core/java/android/os')
-rw-r--r--core/java/android/os/BatteryStats.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 80169a9..4ad9d6d 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -169,7 +169,7 @@ public abstract class BatteryStats implements Parcelable {
/**
* Current version of checkin data format.
*/
- static final String CHECKIN_VERSION = "14";
+ static final String CHECKIN_VERSION = "15";
/**
* Old version, we hit 9 and ran out of room, need to remove.