diff options
| author | 2023-08-08 03:47:43 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:47:43 +0000 | |
| commit | 4c47563c9c6e34cf6c3e79144023f518f8c2a69f (patch) | |
| tree | a90e4cf5dd41c1e703b48306c317851ccbf9d468 /libs/androidfw/ZipFileRO.cpp | |
| parent | 91567e9b8647914227736a94a324662f4bb15772 (diff) | |
| parent | affb156d85a1df721f9e0db2c199680e50e5989e (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483
Change-Id: I39a7395eada3f66cfe720d96b1158a3cb9b0d9ce
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