Dan Albert b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp ...

Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9

2014-11-12 13:24:42 -08:00

..

Android.mk

Move frameworks/base over to libc++.

2014-11-12 11:22:20 -08:00

com_android_server_AlarmManagerService.cpp

…

com_android_server_am_BatteryStatsService.cpp

…

com_android_server_AssetAtlasService.cpp

…

com_android_server_connectivity_Vpn.cpp

…

com_android_server_ConsumerIrService.cpp

…

com_android_server_hdmi_HdmiCecController.cpp

…

com_android_server_input_InputApplicationHandle.cpp

…

com_android_server_input_InputApplicationHandle.h

…

com_android_server_input_InputManagerService.cpp

…

com_android_server_input_InputWindowHandle.cpp

Show error dialogs over apps that dismiss keyguard

2014-11-11 16:22:56 -08:00

com_android_server_input_InputWindowHandle.h

…

com_android_server_lights_LightsService.cpp

…

com_android_server_location_FlpHardwareProvider.cpp

…

com_android_server_location_GpsLocationProvider.cpp

am a084d357: Merge "Fix reference leak in GPS measurement JNI layer. b/16727892 b/17075171" into lmp-mr1-dev automerge: c3e5599

2014-11-07 00:07:12 +00:00

com_android_server_PersistentDataBlockService.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_tv_TvInputHal.cpp

…

com_android_server_UsbDeviceManager.cpp

…

com_android_server_UsbHostManager.cpp

…

com_android_server_VibratorService.cpp

…

onload.cpp

…