f89e4c174a40c697d66c9665ee83ff001607fd93
b86b71823f am: 947c525179 -s ours am: 72badcab6f -s ours
am skip reason: Merged-In I3cd1aa23ad8333f35ec837edd39bc12aeb1573b6 with SHA-1 16186884ec is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19501101
Change-Id: Iacb0a639335444cb714fcd80cf5d5717376b9bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Add a system variant of the merged annotations" am:
16d142849e am: 035a929561 am: b103f0d765 am: 160df6f35f am: 4d140b4023
Merge "Exclude dumpsys from incident in dumpstate" am:
6e1ac19115 am: faef3a82de am: be8e236155 am: 95a3f3f766 am: 7579283b69
Merge "Stop app pinning if lock task is requested from allowedlisted app" into tm-qpr-dev am:
3544e25a4e am: 96986f64df
…
…
Merge "Handle emergency SUPL on active SIM" into tm-d1-dev am:
45811541cf am: 5e93561cb9 am: af45c48f8e
…
…
…
…
Merge "Stop app pinning if lock task is requested from allowedlisted app" into tm-qpr-dev am:
3544e25a4e am: 96986f64df
…
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%