diff options
| author | 2023-08-08 03:06:04 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:06:04 +0000 | |
| commit | 09e0cdedda1bc7d74b4a0f51e657cd95a41f8e17 (patch) | |
| tree | 12cc34b65360a7c7b8305fc81d64ca7f3e1a3ec3 /libs/androidfw/ZipFileRO.cpp | |
| parent | 6beebebf104297bc296f16ef80b2afbfc9e78587 (diff) | |
| parent | a1a4bd2336aefd05bdef96a33bbf55e1c34b6754 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 5bd6bb45d7 -s ours am: 97b5b9acae -s ours am: 34de4bb468 -s ours am: a1a4bd2336 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360
Change-Id: I2054948c3452e406a3b0302141d1b299292b10aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions