diff options
| author | 2022-09-28 17:34:04 +0000 | |
|---|---|---|
| committer | 2022-09-28 17:34:04 +0000 | |
| commit | 0e060f7adc2e10e3cd62c85585d934a3ac07cfbf (patch) | |
| tree | 95f881578fc9b4408029f3d7e830343c172cfcdb /libs/androidfw/ResourceTimer.cpp | |
| parent | b64d4bbbeaa52e749a17167767c67eb8fbc17911 (diff) | |
| parent | 93047c14a20971ae6175c541f93109d44b658e24 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847
Change-Id: Iba0312838de245f1930d5ade8db5a45047138076
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