Tom Cherry 842e5af146 resolve merge conflicts of 7d0c3abcf4 to rvc-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ia19eb2f0061426915f857fdee1cd6112b4a5f9ad

2020-04-13 13:09:58 -07:00

..

aidl/com/android/internal/compat

…

include/android

…

Android.bp

…

asset_manager.cpp

…

configuration.cpp

…

hardware_buffer_jni.cpp

…

input.cpp

…

libandroid_net.map.txt

…

libandroid.map.txt

…

looper.cpp

…

native_activity.cpp

…

native_window_jni.cpp

…

net.c

…

obb.cpp

…

OWNERS

…

sensor.cpp

…

sharedmem.cpp

…

storage_manager.cpp

…

surface_control.cpp

…

system_fonts.cpp

…

thermal.cpp

…

trace.cpp

…