diff options
| author | 2023-08-08 03:47:17 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:47:17 +0000 | |
| commit | 91567e9b8647914227736a94a324662f4bb15772 (patch) | |
| tree | a90e4cf5dd41c1e703b48306c317851ccbf9d468 /libs/androidfw/AttributeResolution.cpp | |
| parent | 7b68ff15982ff7288c5ecff56c0feb2629943596 (diff) | |
| parent | 324233db2c951517cf1589fa1151b7bf8d2f4e5e (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: ed968a1c43 -s ours am: 324233db2c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360
Change-Id: I6aef1ce4a274a44dce3ca731e4aef4bacfc6a4fd
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