Colin Cross 1c38f5d958 resolved conflicts for merge of 1fef485f to master ... Change-Id: If402e68292a183064afe35cb77a4437682ee373a		2014-02-13 13:34:37 -08:00
..
images	healthd: move charger executable to healthd charger mode	2013-09-17 14:41:07 -07:00
Android.mk	Install the nonexistent-source symlink as a post-install step	2013-09-20 10:37:42 -07:00
BatteryMonitor.cpp	healthd: remove/rearrange extra battery property handling	2013-10-22 18:21:27 -07:00
BatteryMonitor.h	healthd: BatteryService dumpstate support	2013-10-22 16:32:54 -07:00
BatteryPropertiesRegistrar.cpp	healthd: remove service batterypropreg	2013-10-22 17:56:21 -07:00
BatteryPropertiesRegistrar.h	healthd: BatteryService dumpstate support	2013-10-22 16:32:54 -07:00
healthd.cpp	healthd: fix runstring option error reporting	2013-11-21 11:28:12 -08:00
healthd.h	healthd: BatteryService dumpstate support	2013-10-22 16:32:54 -07:00
healthd_board_default.cpp	healthd: create healthd_board_init()	2013-08-08 12:26:36 -07:00
healthd_mode_android.cpp	healthd: move Android communication code to separate source	2013-09-17 14:41:07 -07:00
healthd_mode_charger.cpp	resolved conflicts for merge of 1fef485f to master	2014-02-13 13:34:37 -08:00