diff options
| author | 2023-08-08 03:26:37 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:26:37 +0000 | |
| commit | fa364fa27de5e331632f3df69e6be2469df42775 (patch) | |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 /libs/androidfw/ObbFile.cpp | |
| parent | bc6a4f5528b7eb056ca2ea6e91fbf2423e43968f (diff) | |
| parent | 7bdf7eb2b0f360ad24b1bf1c777024ffd52a2b4d (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: a7ea34724f -s ours am: a242d36b8c -s ours am: 571f185a5a -s ours am: 177c0705e2 -s ours am: 7bdf7eb2b0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: I1b2617e4aced6d3bbd652e0c38a21400aa3d9bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions