diff options
| author | 2023-08-08 04:39:08 +0000 | |
|---|---|---|
| committer | 2023-08-08 04:39:08 +0000 | |
| commit | dd8bc29d72ee1751dbfc7bf0f5fdd32313d8c6f3 (patch) | |
| tree | 92def060ea4b4d4b32db7bd8b37435caeaf17d6f /libs/androidfw/ZipFileRO.cpp | |
| parent | 0aaf5cf83f9fa60f82cd7bac286e7b64902502b2 (diff) | |
| parent | 4c47563c9c6e34cf6c3e79144023f518f8c2a69f (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: 4c47563c9c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483
Change-Id: I3e796de60865245b7b5b5e2da8f4a1fa0823bf41
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