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
inputflinger
powermanager
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