diff options
| author | 2022-09-28 18:52:59 +0000 | |
|---|---|---|
| committer | 2022-09-28 18:52:59 +0000 | |
| commit | 66a2f5dc490f86e0a4773946adf18eda7c32157a (patch) | |
| tree | 8669e49b83d0685c8d7bcd306fc485ea458b865b /libs/androidfw/ResourceTimer.cpp | |
| parent | 9b2f48141b6d49f612969323dc71fa908448beda (diff) | |
| parent | 6ca6c6967e508555875f955ee83fa27619a5746b (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: 93047c14a2 -s ours am: 9391e9be6b -s ours am: 6ca6c6967e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847
Change-Id: Ia9345f0212b3b1d805e5144b887bb36f8500e747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions