diff options
| author | 2023-08-08 03:02:59 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:02:59 +0000 | |
| commit | 88364e84d07c0561c968861d77c7799eb28350e4 (patch) | |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 /libs/androidfw/AttributeResolution.cpp | |
| parent | d1dee4da208e016402cb5bc70275c42c0b901725 (diff) | |
| parent | c0a5820b50ed7e6db2ff3ed58096f7b058d665dc (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-v2-dev am: d57db27a1f -s ours am: a1797b3310 -s ours am: d21ca32265 -s ours am: c0a5820b50 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: I60003b8ee236547f43091d7fb3f213dd5a4c8c79
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