diff options
| author | 2023-08-08 03:07:49 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:07:49 +0000 | |
| commit | 1268ee0881ae7fc2f37bb1c23aee21444ea0ce95 (patch) | |
| tree | 88d43b4fcdd60404bcdd70214c9bb8e534846a12 /libs/androidfw/AttributeResolution.cpp | |
| parent | 2afb3fc4cf659977b03915c119c3ad51849cecc7 (diff) | |
| parent | 8e84da7427ff664a40d2ca86ed42c21fd3218b30 (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: 7622520b19 -s ours am: 8e84da7427 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602
Change-Id: I9c12279c907d0e1d3a7f12c3d357c3bd8b8d7b42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions