diff options
| author | 2023-08-08 03:02:54 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:02:54 +0000 | |
| commit | d1dee4da208e016402cb5bc70275c42c0b901725 (patch) | |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 /libs/androidfw/AttributeResolution.cpp | |
| parent | 34cea79ba1031ee52d99bf894a23836041efe334 (diff) | |
| parent | aee7da70e4665e7e4c3830fe6b6690edc98b7f00 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: a7ea34724f -s ours am: a242d36b8c -s ours am: c2c6cdd1cd -s ours am: aee7da70e4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: I72c53ee1945ffb8416cd6c4b5e392986e7289b8f
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