b95a193c1f4cae026bef186538e31aec905ab4ff
Bug: 168166015 Test: robotest & rebuild Change-Id: I16df742156e4bfb18ac0f80bcd14bf1c27a952eb
resolve merge conflicts of
525ed1c275 to rvc-dev-plus-aosp am: be053b7e19 am: 08e54a12ec am: 374718a2a8
…
…
…
Merge "Adding TEST_MAPPING to frameworks/base/keystore" am:
5dd8206c04 am: 844ceb6d89 am: d3bcb99fee am: a017206faa am: 2104618c58
…
…
…
…
…
…
…
…
…
Merge "IorapForwardingService: Suppress error log" am:
c20242f7e6 am: 3e1b131387 am: 2206e69609 am: a0421d89ba am: 1c30e174e9
Merge "Modify the TelecomLoaderService to provide LocalServices to Telecom" into rvc-qpr-dev am:
ebef1b923b am: 4cead2c3e8
Merge "Move PropertyMap from libutils to libinput" am:
bf37f0d136 am: 27e25ee89e am: 3b71c8c742 am: 3faf298e70 am: 775215738b
…
…
…
Merge "Re-apply "Add bp-based disting of android stubs"" into rvc-dev-plus-aosp am:
b1db8662c0 am: 4b57d15fa3 am: b75a7e0983
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%