diff options
| author | 2023-08-08 04:33:52 +0000 | |
|---|---|---|
| committer | 2023-08-08 04:33:52 +0000 | |
| commit | 838410361994bcdadedebec5dd7ec819356ec8ba (patch) | |
| tree | 4cb7fba5e37a583620a447a28828ac54e58e632a /libs/androidfw/ZipFileRO.cpp | |
| parent | c93910025017a41ccd7da82915dd6dde96be3cf8 (diff) | |
| parent | 98921ea24e2cf7c684a348ee669ad69d1c23d94c (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-dev am: c1aa2bb360 -s ours am: 26068ce874 -s ours am: 4d517b4865 -s ours am: b1e88e3d2e -s ours am: 34cb892a71 -s ours am: 08f1a5c82f -s ours am: 98921ea24e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483
Change-Id: Ib38841f97c618e2a083a39e42f9c013f2ae255ca
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