| commit | bc66d3802ba59e7c15b0f62a989a1bc52ddc739f | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Wed Sep 28 16:09:31 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 28 16:09:31 2022 +0000 |
| tree | f4aa198e06d1ae8b83f3f74972ca3a8553857f7c | |
| parent | 5e2b9a43ca43dec72d7fa7ff6a49942132c9b574 [diff] | |
| parent | 538756845848b8e32aeb76bb3bc8e958312d4e9c [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847 Change-Id: I25314284832f9f661b0a11726bd358198efcabcd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>