[automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours am: feba47c36a -s ours am: 0d3f936b8b -s ours am: 5387568458 -s ours am: bc66d3802b -s ours am: 93047c14a2 -s ours am: 9391e9be6b -s ours am: 6ca6c6967e -s ours

Browse Source

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847

Change-Id: Ia9345f0212b3b1d805e5144b887bb36f8500e747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Matt Pietal

2022-09-28 18:52:59 +00:00

committed by Automerger Merge Worker

parent 9b2f48141b 6ca6c6967e

commit 66a2f5dc49

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available