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