Dan Stoza 3890c83721 am 40b4e23a: Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp ... * commit '40b4e23a0396614c841977e932218e3f53089a4a': Revert "SurfaceFlinger: Attempt to attribute fds to layers"		2015-01-27 23:42:56 +00:00
..
batteryservice
inputflinger
powermanager
sensorservice
surfaceflinger	am 40b4e23a: Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp	2015-01-27 23:42:56 +00:00