Jeff Brown 1a33274d28 resolved conflicts for merge of 167449e5 to master ...

Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67

2010-07-08 19:01:13 -07:00

..

Android.mk

More native input dispatch work.

2010-07-03 19:23:01 -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

More native input dispatch work.

2010-07-03 19:23:01 -07:00

com_android_server_LightsService.cpp

LightsService cleanup:

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

com_android_server_location_GpsLocationProvider.cpp

am 2a28f4b4: am 5b8364a9: GPS: stifle some logging

2010-06-30 07:07:06 -07:00

com_android_server_PowerManagerService.cpp

More native input dispatch work.

2010-07-03 19:23:01 -07:00

com_android_server_PowerManagerService.h

More native input dispatch work.

2010-07-03 19:23: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

More native input dispatch work.

2010-07-03 19:23:01 -07:00