41a24f463c28be139bc07a952e48e4f2ac805353
b4f626d13e am: 78f1a9bf51 am: 4230a055d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879511 Change-Id: I1f9814117187d712c4e5df8140d6ff62f06ebdf3
Merge "tempAllowList duration can be updated if an UID is already temp allowlisted." into sc-qpr1-dev am:
add3a2e361
Merge changes from topic "expose-pending-intent" into stage-aosp-master am:
b4f626d13e am: 78f1a9bf51 am: 4230a055d3
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Rename shouldUseDefaultUnfoldTransition attribute and update docs" into sc-v2-dev am:
b85da640d1
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Fix broken test on GSI branch" into stage-aosp-master am:
10284429b8 am: 4e1d55b395 am: 8266717dbc
Merge "Fix framworks/base compiling against musl" am:
2cba49ac56 am: d5b3d74850 am: 1559860d81 am: 4ebc6b077f
…
Merge "Migrate IPsec modules to use state machine lib" am:
4e23d56de4 am: 83a970d901 am: 8f3046ec5e am: 108735fe6e
…
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%