Elliott Hughes 7948a33f2c resolve merge conflicts of a4398c1 to stage-aosp-master am: 195669febc ... am: b2ab1c43cb Change-Id: I412943235ad6cd908aca04c56aa19a3d2bbb5413		2016-10-14 02:55:55 +00:00
..
images
include/healthd
tests	Allow customization of charger animation	2016-09-12 21:07:27 -07:00
Android.mk	resolve merge conflicts of 565ba02 to nyc-mr1-dev-plus-aosp	2016-09-13 08:37:37 -07:00
animation.h	Allow customization of charger animation	2016-09-12 21:07:27 -07:00
AnimationParser.cpp	Allow customization of charger animation	2016-09-12 21:07:27 -07:00
AnimationParser.h	Allow customization of charger animation	2016-09-12 21:07:27 -07:00
BatteryMonitor.cpp	Move off std::sto* function which abort on failure.	2016-10-13 15:34:05 -07:00
BatteryPropertiesRegistrar.cpp
BatteryPropertiesRegistrar.h
healthd.cpp
healthd_board_default.cpp
healthd_mode_android.cpp
healthd_mode_charger.cpp	resolve merge conflicts of 565ba02 to nyc-mr1-dev-plus-aosp	2016-09-13 08:37:37 -07:00