diff options
| author | 2023-08-08 02:27:33 +0000 | |
|---|---|---|
| committer | 2023-08-08 02:27:33 +0000 | |
| commit | 1902369c717ff753d3e83f19ea6b9ac5ec07ba6d (patch) | |
| tree | 88d43b4fcdd60404bcdd70214c9bb8e534846a12 /libs/androidfw/ObbFile.cpp | |
| parent | 8f0a0f761c975648a66da433abab45cf006157da (diff) | |
| parent | 53c0fc53a3a8e9fa07f58979af6270f241c344e0 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-qpr1-dev am: 2028c143ae -s ours am: 34cc50a453 -s ours am: 4876714be3 -s ours am: 53c0fc53a3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602
Change-Id: Ie9313aa1c8a5d7b64e8ab41d0de955cdb3fc9c48
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