07a7cf045fcfdc08f95c1b7b2b242f550535f0d8
00e6e9cd26 -s ours am: 09adeddd2a -s ours am: a4ad343ea2 -s ours
am skip reason: Merged-In Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf is already in history. Merged-In was found from reverted change.
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767730
Change-Id: I4490460f98c8009ff10c4d3d2f984dddbdc13b90
Merge "Support platform-compat-framework for TeleService" am:
7ad8aa929e am: 2e7d4fe98b am: 02adf2d91d
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "profcollect: Add verbose logging for ota status updates" am:
ac418218f8 am: c7c73d4ee1 am: eb1b047f7d
Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev am:
ba314fbb85 am: b4fe9c3215
Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" am:
d92daec786 am: 697971f693 am: 2a1b0ab7cd
…
Merge "Support platform-compat-framework for TeleService" am:
7ad8aa929e am: 2e7d4fe98b am: 02adf2d91d
…
Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am:
b82853357b am: 89aedd6cb8 am: af77c134d9
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%