diff options
| author | 2023-08-08 03:01:50 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:01:50 +0000 | |
| commit | e14df1a3d074e1afa844b9512be547c6ec20409c (patch) | |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 /libs/androidfw/AttributeResolution.cpp | |
| parent | 84dc14a368d68fcc51459d57f21a78eb1106b669 (diff) | |
| parent | a3c97f9945ebc1846d53102f79c09cb266c58705 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b1586 am: c731ba0701 -s ours am: a3c97f9945 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063
Change-Id: I153b53a007cbdef3918932cb60e8a0031514b20e
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