diff options
| author | 2023-08-08 02:17:54 +0000 | |
|---|---|---|
| committer | 2023-08-08 02:17:54 +0000 | |
| commit | 177c0705e21170b2471e8d5564124876c9517afd (patch) | |
| tree | 4cb7fba5e37a583620a447a28828ac54e58e632a /libs/androidfw/AttributeResolution.cpp | |
| parent | ede1f1a5bde094971a9255360c77d3ceb6841990 (diff) | |
| parent | 571f185a5acb4f99e46e8ae3b0e5934cd124c80e (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: a7ea34724f -s ours am: a242d36b8c -s ours am: 571f185a5a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: Id3826f0c98f18f2e5cba14f92fb219179e49f5e2
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