OSDN Git Service

resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp
authorJeff Brown <jeffbrown@google.com>
Wed, 30 Oct 2013 01:28:57 +0000 (18:28 -0700)
committerJeff Brown <jeffbrown@google.com>
Wed, 30 Oct 2013 01:28:57 +0000 (18:28 -0700)
commit81b7caf0d12fb56ab40592467d6b1cbcaef8f0b4
tree1ee86b34aac5783d7ec9954ad5653b52a143368d
parentf129536f8edabff04dc913525b9a6c981e57390c
parent5214dae44cbf9a5d51b7c5a468b8bf86c56d9ffd
resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp

Change-Id: I769e7acbe207b9c3a60ff1576d11b3ab40b8c66d
core/java/android/os/BatteryStats.java
core/java/com/android/internal/os/BatteryStatsImpl.java