diff options
| author | 2023-08-08 02:17:00 +0000 | |
|---|---|---|
| committer | 2023-08-08 02:17:00 +0000 | |
| commit | b1e88e3d2e8fe8a0bf5f16970160f0c6ffa6c8a5 (patch) | |
| tree | 95306a0149591da336f01a8a60f67f58d17d780f /libs/androidfw/ZipFileRO.cpp | |
| parent | e7ef06df7064339626ef013b1085fd5ed8e5eadb (diff) | |
| parent | 4d517b4865ffcaa2902615c58bc356fa06f6b3be (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483
Change-Id: I04c024d8be47ca1658bac33f9ebad289544dd1a6
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