Dan Stoza 22d0bdf326 resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp ... Change-Id: I0be2ecb8085f2cd9560138460bcc27d71c011608		2015-01-27 11:49:26 -08:00
..
batteryservice	Replace IInterface::asBinder() with a static	2014-11-17 08:47:01 -08:00
inputflinger	am a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the openssl headers."	2015-01-10 00:14:12 +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	resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp	2015-01-27 11:49:26 -08:00