diff options
| author | 2023-08-08 03:50:20 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:50:20 +0000 | |
| commit | 742b90921013c7b5da2f4aeea6c18377f88f6cfe (patch) | |
| tree | 61792c7b44719985996c805a1d5a440d56710ed7 /libs/androidfw/AttributeResolution.cpp | |
| parent | a4a3f61406ddd3f738f0d2fbc658d0f0ea81ea6f (diff) | |
| parent | 09e0cdedda1bc7d74b4a0f51e657cd95a41f8e17 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 5bd6bb45d7 -s ours am: 97b5b9acae -s ours am: 34de4bb468 -s ours am: a1a4bd2336 -s ours am: 09e0cdedda -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360
Change-Id: I3e6b2837cbef075c6104dfbe7c808ca46cfbe157
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