diff options
| author | 2023-08-08 02:25:51 +0000 | |
|---|---|---|
| committer | 2023-08-08 02:25:51 +0000 | |
| commit | aee7da70e4665e7e4c3830fe6b6690edc98b7f00 (patch) | |
| tree | 88d43b4fcdd60404bcdd70214c9bb8e534846a12 /libs/androidfw/ObbFile.cpp | |
| parent | 94e32c7070f17a4050c8f016a05b374892d445de (diff) | |
| parent | c2c6cdd1cdad461e21091559b006d984b90d7b30 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: a7ea34724f -s ours am: a242d36b8c -s ours am: c2c6cdd1cd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: I2dca5d5133c66dee6775a3cfbb33fdc98337b5fd
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