d0de93308b571aef79c8c5eb76c045d1ea7e1cdf
56da278127 am: 7a5e865a80 am: b145311a8d am: 3bff601a8a am: 3788ac124b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429968 Change-Id: If5f2440d3c7621bc9ce9260e5f7d0ad3b5d71d65
Merge "Add action for Bluetooth tethering state changed" am:
cf44a015e8 am: 773810d198 am: f03a18b7ab am: eca1afc382 am: e6b1120635
resolve merge conflicts of
525ed1c275 to rvc-dev-plus-aosp am: be053b7e19 am: 08e54a12ec am: 374718a2a8
Merge "Add action for Bluetooth tethering state changed" am:
cf44a015e8 am: 773810d198 am: f03a18b7ab am: eca1afc382 am: e6b1120635
Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to DownloadProvider" into rvc-qpr-dev am:
8b9d40586b am: aed20efa42
…
Merge "Update language to comply with Android's inclusive language guidance" am:
f98e615b6d am: 9016cc88e3
…
Merge "Adding TEST_MAPPING to frameworks/base/keystore" am:
5dd8206c04 am: 844ceb6d89 am: d3bcb99fee am: a017206faa am: 2104618c58
…
Merge "Revert "Ringtone uri should add type query"" am:
56da278127 am: 7a5e865a80 am: b145311a8d am: 3bff601a8a am: 3788ac124b
…
…
…
Merge "Add action for Bluetooth tethering state changed" am:
cf44a015e8 am: 773810d198 am: f03a18b7ab am: eca1afc382 am: e6b1120635
…
…
…
…
Merge "IorapForwardingService: Suppress error log" am:
c20242f7e6 am: 3e1b131387 am: 2206e69609 am: a0421d89ba am: 1c30e174e9
Merge "Expose Telecom constants for use in Telephony" am:
9fcb2819d0 am: 1bf919f084 am: 5b6beb2fc0 am: 2f8cf2f852 am: 74bb99708b
Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" am:
0b778939c7 am: 3f1247e91b am: 7d95615a4d am: 5f1edaf743 am: 3371e64939
…
…
…
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%