diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-19 18:31:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 18:31:20 +0000 |
| commit | 5c577bab3b4cd9bf74a09368be5d73aed627f6a5 (patch) | |
| tree | e3afa5474d72318c43e08a71f0d28b98bc670aca /core/java/com | |
| parent | 399237f825863f8d52336778debde8c54313cca2 (diff) | |
| parent | 29cd880890825ce15a1b2da977bcb1796db6f4e3 (diff) | |
| download | frameworks_base-5c577bab3b4cd9bf74a09368be5d73aed627f6a5.zip frameworks_base-5c577bab3b4cd9bf74a09368be5d73aed627f6a5.tar.gz frameworks_base-5c577bab3b4cd9bf74a09368be5d73aed627f6a5.tar.bz2 | |
am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3':
Fix issue #23326715: Clarify --checkin/-c options in batterystats
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 6c7e298..4ff7869 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -25,7 +25,6 @@ import android.net.ConnectivityManager; import android.net.NetworkStats; import android.net.wifi.WifiActivityEnergyInfo; import android.net.wifi.WifiManager; -import android.os.BadParcelableException; import android.os.BatteryManager; import android.os.BatteryStats; import android.os.Build; |