| commit | feba47c36a605dd0c6c649edf288d0d88f8f7732 | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Wed Sep 28 14:53:24 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 28 14:53:24 2022 +0000 |
| tree | 1524a25c27ff6a0f14ba69389ff29970c777b029 | |
| parent | 2fdf59ef4566371ab2b502f5f247d6f2494b08ce [diff] | |
| parent | 4b70b75d1ca0c15850f1fcc84633e9bdea7538d3 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847 Change-Id: Ia105005b59b08288288fd1cfc7e139080fa8df00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>