Jeff Brown 10102e4c0e resolved conflicts for merge of baaa080b to master ...

Change-Id: I3ee12321e298f7a2ea577a99f30c49f3bb497fae

2014-02-20 18:05:03 -08:00

..

Android.mk

resolved conflicts for merge of baaa080b to master

2014-02-20 18:05:03 -08:00

com_android_server_AlarmManagerService.cpp

…

com_android_server_AssetAtlasService.cpp

am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"

2014-02-20 13:02:21 +00:00

com_android_server_connectivity_Vpn.cpp

…

com_android_server_ConsumerIrService.cpp

…

com_android_server_dreams_McuHal.cpp

Add a new "doze mode" based on Dream components.

2014-02-20 13:39:13 -08:00

com_android_server_input_InputApplicationHandle.cpp

…

com_android_server_input_InputApplicationHandle.h

…

com_android_server_input_InputManagerService.cpp

resolved conflicts for merge of baaa080b to master

2014-02-20 18:05:03 -08:00

com_android_server_input_InputWindowHandle.cpp

…

com_android_server_input_InputWindowHandle.h

…

com_android_server_lights_LightsService.cpp

…

com_android_server_location_FlpHardwareProvider.cpp

…

com_android_server_location_GpsLocationProvider.cpp

…

com_android_server_power_PowerManagerService.cpp

…

com_android_server_power_PowerManagerService.h

…

com_android_server_SerialService.cpp

…

com_android_server_SystemServer.cpp

…

com_android_server_UsbDeviceManager.cpp

…

com_android_server_UsbHostManager.cpp

am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"

2014-02-18 17:19:38 +00:00

com_android_server_VibratorService.cpp

…

onload.cpp

Add a new "doze mode" based on Dream components.

2014-02-20 13:39:13 -08:00