Dan Stoza 3c7eb4fe23 am 3372cc25: resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aosp ... * commit '3372cc25df255b94e4eb75920afaf43ee5edc39f': SurfaceFlinger: Attempt to attribute fds to layers		2015-01-17 00:53:35 +00:00
..
batteryservice	Replace IInterface::asBinder() with a static	2014-11-17 08:47:01 -08:00
inputflinger	am 23958e14: am a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the openssl headers."	2015-01-10 00:18:15 +00:00
powermanager	Frameworks/native: Wall Werror in batteryservice & powermanager	2014-11-13 14:31:11 -08:00
sensorservice	am 46ca041f: Merge "Don\'t error out because SensorEventConnection::dump overloads BBinder::dump"	2014-11-25 23:55:52 +00:00
surfaceflinger	am 3372cc25: resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aosp	2015-01-17 00:53:35 +00:00