diff options
| author | 2023-08-08 01:36:59 +0000 | |
|---|---|---|
| committer | 2023-08-08 01:36:59 +0000 | |
| commit | 7b4b95869e09bce7f08f3dc1382753104e932046 (patch) | |
| tree | 61792c7b44719985996c805a1d5a440d56710ed7 /libs/androidfw/AttributeResolution.cpp | |
| parent | 571f185a5acb4f99e46e8ae3b0e5934cd124c80e (diff) | |
| parent | a1797b3310c8ff22161d1fe67a0f6bf5e3c3ada7 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: I002ebd53c96ea6b4e01a5c032eb7cd2a608a0699
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