diff options
| author | 2022-09-28 16:06:19 +0000 | |
|---|---|---|
| committer | 2022-09-28 16:06:19 +0000 | |
| commit | 538756845848b8e32aeb76bb3bc8e958312d4e9c (patch) | |
| tree | d6bc22c7005ca6e5771b1a3ad1e81ae495521bd7 /libs/androidfw/ResourceTimer.cpp | |
| parent | f76ea6006a93c4a4afa9e5e9fbcda7eeb7e5f9f4 (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: Ibb01e635df3c610fe2c907bdb59b09b38e1f8e04
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