Elliott Hughes bbc7ca24da resolved conflicts for merge of 6e9b28b2 to master ... Change-Id: Icd1bbc33283c504691934256a4cf5989868d3caf		2015-04-15 12:15:00 -07:00
..
images	remove pixelflinger from healthd	2014-03-11 12:25:41 -07:00
Android.mk	Remove obsolete BUILD_TINY_ANDROID check from healthd makefile	2015-01-24 04:26:16 +00:00
BatteryMonitor.cpp	resolved conflicts for merge of 03be4928 to lmp-mr1-dev-plus-aosp	2014-11-25 11:45:46 -08:00
BatteryMonitor.h	healthd: Set fixed battery level and temperature via properties	2014-05-22 01:56:15 +00:00
BatteryPropertiesRegistrar.cpp	Update calls to IInterface::asBinder()	2014-11-17 10:06:42 -08:00
BatteryPropertiesRegistrar.h	healthd: BatteryService dumpstate support	2013-10-22 16:32:54 -07:00
healthd.cpp	am 38c3386a: resolved conflicts for merge of 03be4928 to lmp-mr1-dev-plus-aosp	2014-11-25 20:03:41 +00:00
healthd.h	Charger: Add a Charger to Android transition threshold	2014-10-22 22:01:07 +00:00
healthd_board_default.cpp	Cleanup: warning fixit.	2014-04-11 16:15:46 -07:00
healthd_mode_android.cpp	healthd: Turn on -Werror	2014-05-15 15:46:15 -07:00
healthd_mode_charger.cpp	resolved conflicts for merge of 6e9b28b2 to master	2015-04-15 12:15:00 -07:00