Lajos Molnar e7bda06398 resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp ... Change-Id: Idbe39c6de8fe31ac57a9238c18b4c20d66dc73ad		2014-09-18 20:05:27 -07:00
..
batteryservice	BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties	2014-05-16 03:05:11 +00:00
inputflinger	am 41943dd0: am 9e24c319: Merge "Fix type for temp variable" into lmp-dev	2014-09-04 22:23:17 +00: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:05:27 -07:00