diff options
| author | 2023-08-08 04:38:06 +0000 | |
|---|---|---|
| committer | 2023-08-08 04:38:06 +0000 | |
| commit | 63db4c1be2095c3bdfe1d5a6a36f05f6aa4c1ab0 (patch) | |
| tree | 92def060ea4b4d4b32db7bd8b37435caeaf17d6f /libs/androidfw/ZipFileRO.cpp | |
| parent | e39b390b82b668c3d9ee3442567ce45baca6b77e (diff) | |
| parent | 7b68ff15982ff7288c5ecff56c0feb2629943596 (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: 09e0cdedda -s ours am: 7b68ff1598 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360
Change-Id: Id4d76718a739107b1ca7a1f34153acfc6c536ef2
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