ce2bff03cff6f158a75c2f119affc4cb849ae5d6
b0ccf6470f -s ours
am skip reason: skip tag Change-Id I6120443a03ec22d1ca672e5a1acf8b3752e1c3ee with SHA-1 c9e4cf30f0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14040815
Change-Id: I6061c955b53fb388c586c9050311821a13313030
Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" am:
a8b1b1a2e6 am: 08945c21ef am: 66ead4fb0b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" am:
a8b1b1a2e6 am: 08945c21ef am: 66ead4fb0b
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 "[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 am: 9864e155a8
Merge "Pin sched group of service processes with binding flag SLTA at top" into sc-dev am:
b35f41d955
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Fix a bug where the wrong profile is queried" am:
f83190c218 am: 92d3c13ed8 am: a776c7ca39 am: 6c63ebbb9e
…
Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" am:
a8b1b1a2e6 am: 08945c21ef am: 66ead4fb0b am: 9ba0f37f8a
…
Merge "Add a shared filegroup for non-updatable stub sources" am:
4ffb28c5f3 am: 4d79002c3c am: 916e38597d
Merge "Add auto-postsubmit test tag for frameworks/base" am:
ec14bafb25 am: 987d246395 am: c8cf0becf0
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%