diff options
| author | 2023-08-08 03:23:57 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:23:57 +0000 | |
| commit | 58e9ce3e948addd94ca3fd66e42fb40e5c7b7437 (patch) | |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 /libs/androidfw/ObbFile.cpp | |
| parent | 2a21ae463009798f6374337f2fdc0f93fa66cf64 (diff) | |
| parent | 13cbc11d04f025077e07efc937178bd25c80e52c (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 8c2d2c6fc9 am: 5041574a8d -s ours am: f727511022 -s ours am: 13cbc11d04 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063
Change-Id: I61d4e60c64c02634b2a268422a57bdb5448bd339
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