diff options
| author | 2023-08-08 03:03:26 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:03:26 +0000 | |
| commit | 2a21ae463009798f6374337f2fdc0f93fa66cf64 (patch) | |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 /libs/androidfw/AttributeResolution.cpp | |
| parent | a2afe55219459dbd7e5e6e146e4637121c0dcd0e (diff) | |
| parent | 1902369c717ff753d3e83f19ea6b9ac5ec07ba6d (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: 1902369c71 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602
Change-Id: I5ad8b0adeba085cdc42688d1c87e13426e5dffb9
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