Jeff Brown 8e03b7566c resolved conflicts for merge of 9e660c82 to master ...

Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43

2010-06-13 19:16:55 -07:00

..

Android.mk

Native input dispatch rewrite work in progress.

2010-06-13 17:42:16 -07:00

com_android_server_AlarmManagerService.cpp

Fix alarms with negative or very large wakup times.

2010-03-31 15:38:08 -07:00

com_android_server_BatteryService.cpp

BatteryService: Add support for new standard battery voltage and temperature attributes.

2009-08-17 19:58:32 -04:00

com_android_server_InputManager.cpp

Native input dispatch rewrite work in progress.

2010-06-13 17:42:16 -07:00

com_android_server_KeyInputQueue.cpp

Native input dispatch rewrite work in progress.

2010-06-13 17:42:16 -07:00

com_android_server_LightsService.cpp

LightsService cleanup:

2009-11-27 15:02:11 -05:00

com_android_server_location_GpsLocationProvider.cpp

am 04598b67: GPS: Support for GPS HAL managing its own scheduling

2010-04-15 12:34:01 -07:00

com_android_server_SensorService.cpp

less log spew

2010-01-08 15:46:24 -05:00

com_android_server_SystemServer.cpp

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:12 -07:00

com_android_server_VibratorService.cpp

Remove HardwareService and move vibrator support to VibratorService.

2009-11-25 12:54:58 -05:00

onload.cpp

Native input dispatch rewrite work in progress.

2010-06-13 17:42:16 -07:00