Elliott Hughes bb5ec4a926 resolve merge conflicts of 796987482 to stage-aosp-master ... Test: I solemnly swear I tested this conflict resolution. Change-Id: Ica884c137c5f21e261600b2b011ab963036c0cdb		2017-10-17 12:36:14 -07:00
..
images	…
include/healthd	healthd: move binder fd to not use EPOLLWAKEUP am: e89ea5eb85	2016-10-21 21:53:49 +00:00
tests	…
Android.mk	healthd: restructure healthd_mode_charger	2017-07-18 15:06:46 -07:00
AnimationParser.cpp	…
AnimationParser.h	…
BatteryMonitor.cpp	Merge "healthd: add battery health status values from JEITA spec" am: 5dd87c4ef6	2017-06-21 19:29:25 +00:00
BatteryPropertiesRegistrar.cpp	healthd: notify listeners using local copy of list, drop lock	2017-06-29 22:25:40 +00:00
BatteryPropertiesRegistrar.h	healthd: Implement scheduleUpdate	2017-03-22 12:15:11 -07:00
animation.h	…
charger.cpp	healthd: refactor healthd code to split into 'charger' and 'healthd'	2016-11-08 07:36:07 -08:00
healthd.cpp	health HAL uses "default" service name	2017-02-23 19:32:29 +00:00
healthd_common.cpp	healthd: refactor healthd code to split into 'charger' and 'healthd'	2016-11-08 07:36:07 -08:00
healthd_draw.cpp	healthd: restructure healthd_mode_charger	2017-07-18 15:06:46 -07:00
healthd_draw.h	healthd: restructure healthd_mode_charger	2017-07-18 15:06:46 -07:00
healthd_mode_android.cpp	healthd: refactor healthd code to split into 'charger' and 'healthd'	2016-11-08 07:36:07 -08:00
healthd_mode_charger.cpp	resolve merge conflicts of 796987482 to stage-aosp-master	2017-10-17 12:36:14 -07:00