| commit | 93047c14a20971ae6175c541f93109d44b658e24 | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Wed Sep 28 16:37:24 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 28 16:37:24 2022 +0000 |
| tree | 15fb5fa377098bf953a950b94c74fddef6c6ccfc | |
| parent | 12032fc4922235fb7edfd428a4b782d4d547d8b5 [diff] | |
| parent | bc66d3802ba59e7c15b0f62a989a1bc52ddc739f [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847 Change-Id: I957fee3964f5522c386b69ec15f071dbf2ce016d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>