61742eded7d76c40d582c61bb1060e22d2240945
b1bf7f55c0 am: 25d1e643ec -s ours am: f289bf2d8b -s ours am: 812e82aad2 -s ours am: d2ffae2c3d -s ours
am skip reason: Merged-In I35bf6f5911dc0ee56e43af7faddaceb479362863 with SHA-1 c006ad915a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15888884
Change-Id: I5fbac99fb412d4ba716a3da32fb6a229d24c3804
Merge "Remove frameworks/base/apex/appsearch and associated tests" into stage-aosp-master am:
8efe26afd6 am: f26b06a489
RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus am:
a4f760bee7 am: 72ea33eb75
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
RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus am:
a4f760bee7 am: 72ea33eb75
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%