diff options
| author | 2022-09-28 14:24:30 +0000 | |
|---|---|---|
| committer | 2022-09-28 14:24:30 +0000 | |
| commit | 4b70b75d1ca0c15850f1fcc84633e9bdea7538d3 (patch) | |
| tree | 20cc76791de604fb324a124bdde9709cfb9f2cb9 /libs/androidfw/StringPool.cpp | |
| parent | d7710fc38a619bc7f2d11a72d7a46189e482965c (diff) | |
| parent | d78f1693ef721ba057ba7ff9f8f6cc450e5875eb (diff) | |
[automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847
Change-Id: If6b7f47d6cdb87b4861b925a1fa0a2db742632b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions