diff options
| author | 2022-09-28 17:34:09 +0000 | |
|---|---|---|
| committer | 2022-09-28 17:34:09 +0000 | |
| commit | 9391e9be6bb585b058bfc9800bcfb88c2648f562 (patch) | |
| tree | a43ec04395d69fa7241488cc10b57ce2c18aa7ba /libs/androidfw/ResourceTimer.cpp | |
| parent | 0ad08441fdb66f47f230efe9f00bf21fb64accf0 (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: I90e234ed147953f8e8dbb8b617f15bb1704d647e
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