72badcab6f93dd8a0b04faaf4d3e9c2078e6d69f
b86b71823f am: 947c525179 -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: Ic859a44ae5b0ebcaeb49342a2e743afd65e409ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Stop app pinning if lock task is requested from allowedlisted app" into tm-qpr-dev am:
3544e25a4e
…
…
Merge "Add instructions on how to annotate an AIDL interface" am:
b6df9fb2e8 am: b691d9ce36 am: 9e7a44c173 am: 3ced8e8092
Merge "Support shell rotation transition on general window container" into tm-qpr-dev am:
b27282acb5
…
…
…
Merge "Stop app pinning if lock task is requested from allowedlisted app" into tm-qpr-dev am:
3544e25a4e
Merge "Throw illegal state exception when service is not available" am:
572a358723 am: f431f2cadd am: cd314a3ae6 am: d15332406a
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%