diff options
| author | 2023-08-08 03:07:36 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:07:36 +0000 | |
| commit | 2afb3fc4cf659977b03915c119c3ad51849cecc7 (patch) | |
| tree | 88d43b4fcdd60404bcdd70214c9bb8e534846a12 /libs/androidfw/AttributeResolution.cpp | |
| parent | 7bdd7c80fd7e23bb7dce8552c6ea12ac51396e3d (diff) | |
| parent | 2fcfc9439a83d157ec417310665d15d7f99b13f9 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 976fd54a43 -s ours am: 4306517b07 -s ours am: 6b6765b146 -s ours am: 96aa5fc183 -s ours am: 2fcfc9439a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602
Change-Id: Ie742e7db18fbfa9280652b7739d8f9e4829b030c
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