| commit | f24d7ed03bc8c1a526f4cd0d4bd018d34c4de2e2 | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Wed Sep 28 18:02:46 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 28 18:02:46 2022 +0000 |
| tree | 5b06597a685dc1b157c9bc7f44bd25c6bd309346 | |
| parent | 4c3cbe4a790943a5ab7249115229a7cc5b325d76 [diff] | |
| parent | 3b47346b6bd0f78b3038be5539aa0b4079818ed3 [diff] |
[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: 3b47346b6b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847 Change-Id: I848c627f32b699e6c308af0f4dd46e803e3904d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>