diff options
| author | 2023-08-08 03:52:41 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:52:41 +0000 | |
| commit | 8bc1504d13495b31152dbff747f9f18c242952a6 (patch) | |
| tree | d72875ddd02a38f67dcb3d4629ea01f1ba7eb2c8 /libs/androidfw/AttributeResolution.cpp | |
| parent | cb6ce62933fcb0ba8b818fb11fa6adecef232ddc (diff) | |
| parent | a2afe55219459dbd7e5e6e146e4637121c0dcd0e (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: 00bf4456c3 -s ours am: 8f0a0f761c -s ours am: a2afe55219 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602
Change-Id: Ia6d577f3476a533f6cdc4d8674ea6ca6c89aa381
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