diff options
| author | 2023-08-08 02:22:44 +0000 | |
|---|---|---|
| committer | 2023-08-08 02:22:44 +0000 | |
| commit | a0dc510a49987f172f80dae1a0d49b33af069c21 (patch) | |
| tree | 243a9ee02ceb28efd86113062fa238c51f7acda6 /libs/androidfw/AttributeResolution.cpp | |
| parent | ed968a1c43d2c424032e002c687379dfcca12f17 (diff) | |
| parent | e7ef06df7064339626ef013b1085fd5ed8e5eadb (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c21f -s ours am: 3b8290a881 -s ours am: 7d29675ebd -s ours am: e7ef06df70 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483
Change-Id: Ifda2f68eb8197d9a8b2bc013a930781702aed09a
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