diff options
| author | 2023-08-08 03:51:13 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:51:13 +0000 | |
| commit | a2f4bceba0529894d259a67bb30894aa34fbd2da (patch) | |
| tree | 61792c7b44719985996c805a1d5a440d56710ed7 /libs/androidfw/ZipFileRO.cpp | |
| parent | 693a6c22cc66f5dc5d2517f36ea7619b984b1e2e (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: If0e0e211d2d551f543ecddb3055fe4efe680c4d0
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