diff options
| author | 2023-08-08 05:18:54 +0000 | |
|---|---|---|
| committer | 2023-08-08 05:18:54 +0000 | |
| commit | 73d0008bdb1f8e11ae0d63e703d5f4058d022e53 (patch) | |
| tree | 92def060ea4b4d4b32db7bd8b37435caeaf17d6f /libs/androidfw/ZipFileRO.cpp | |
| parent | ad469252ffbb73718a16ab0e74d954f7a0410d6e (diff) | |
| parent | 7718d7a5851c7fcea8bbd34f5109e5c1762084d5 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-qpr-dev am: 6ff8b636ee -s ours am: 91c3b175ac -s ours am: 3029dc01e5 -s ours am: ed968a1c43 -s ours am: 324233db2c -s ours am: 693a6c22cc -s ours am: 7718d7a585 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360
Change-Id: I2d9ca91b1a23280698c026f8f329acb14bb84e00
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