Lajos Molnar 435d9cde27 resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp ... Change-Id: I2e9aab90ac53bb32630598f50cc26f6e46acf6d6		2014-09-18 20:09:39 -07:00
..
batteryservice	BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties	2014-05-16 03:05:11 +00:00
inputflinger	Fix type for temp variable	2014-08-29 16:16:26 -07:00
powermanager	Make IPowerManager native conform to .aidl for oneway	2014-09-05 17:12:24 -07:00
sensorservice	SensorService fixes.	2014-09-15 20:32:21 +00:00
surfaceflinger	resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp	2014-09-18 20:09:39 -07:00