diff options
| author | 2023-08-08 03:54:03 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:54:03 +0000 | |
| commit | c506dd6fb52d93d0ae576979a4576b2086b85592 (patch) | |
| tree | d72875ddd02a38f67dcb3d4629ea01f1ba7eb2c8 /libs/androidfw/AttributeResolution.cpp | |
| parent | 6116de284f5a549803d500a7f42f031f0f80b386 (diff) | |
| parent | fa364fa27de5e331632f3df69e6be2469df42775 (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: 177c0705e2 -s ours am: 7bdf7eb2b0 -s ours am: fa364fa27d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: I1c912c304c82b993ec23dd3c809e53bd338d382e
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