| commit | 953563d12dda2c00d0d82c34c963ac64dfd0d8b7 | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Thu Feb 23 23:16:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 23 23:16:33 2023 +0000 |
| tree | f72082ccc8290c1142a202d2f872bcdc6bd17816 | |
| parent | bc400d712aadbb7e6e42981e6c3ddf3bd4c809ef [diff] | |
| parent | be6bf9d5ea10e0253475c95bbfeb48691e5d5872 [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: be6bf9d5ea -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847 Change-Id: I6e797a3055fd057969d54c437b549f18f097955a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>