diff options
| author | 2023-08-08 02:22:22 +0000 | |
|---|---|---|
| committer | 2023-08-08 02:22:22 +0000 | |
| commit | ed968a1c43d2c424032e002c687379dfcca12f17 (patch) | |
| tree | 243a9ee02ceb28efd86113062fa238c51f7acda6 /libs/androidfw/AttributeResolution.cpp | |
| parent | a1a4bd2336aefd05bdef96a33bbf55e1c34b6754 (diff) | |
| parent | 3029dc01e5194a5890548a079ff057b3a83fc09a (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-qpr-dev am: 6ff8b636ee -s ours am: 91c3b175ac -s ours am: 3029dc01e5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360
Change-Id: I852e97de3c64bab96abe2601dc3efa4d499a915f
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