diff options
| author | 2023-08-08 04:33:38 +0000 | |
|---|---|---|
| committer | 2023-08-08 04:33:38 +0000 | |
| commit | c93910025017a41ccd7da82915dd6dde96be3cf8 (patch) | |
| tree | 4cb7fba5e37a583620a447a28828ac54e58e632a /libs/androidfw/ZipFileRO.cpp | |
| parent | 7718d7a5851c7fcea8bbd34f5109e5c1762084d5 (diff) | |
| parent | a2f4bceba0529894d259a67bb30894aa34fbd2da (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c21f -s ours am: 3b8290a881 -s ours am: 7d29675ebd -s ours am: e7ef06df70 -s ours am: a0dc510a49 -s ours am: affb156d85 -s ours am: a2f4bceba0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483
Change-Id: Id43d7ceeb36dbbf1cbff5f965a6aa0d116436b2c
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