Lajos Molnar 147372fdf9 resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp ... Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc		2014-09-19 06:23:46 -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-mr1-dev-plus-aosp	2014-09-19 06:23:46 -07:00