| commit | be6bf9d5ea10e0253475c95bbfeb48691e5d5872 | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Wed Sep 28 16:08:24 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 28 16:08:24 2022 +0000 |
| tree | ac96f399bfbfa3024b8244595614c77f61d34b19 | |
| parent | 13f54aba876738b1d9d4d602c4d4869283f7a73c [diff] | |
| parent | 0d3f936b8b0a148e9ce946689b809d1aec778705 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847 Change-Id: I658520434b8017aeb1b29adc60b90d50cbfb4541 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>