diff options
| author | 2023-08-08 02:18:08 +0000 | |
|---|---|---|
| committer | 2023-08-08 02:18:08 +0000 | |
| commit | 98f92dd44cc27813515769a3b5ded36651bf4bea (patch) | |
| tree | 4cb7fba5e37a583620a447a28828ac54e58e632a /libs/androidfw/AttributeResolution.cpp | |
| parent | 177c0705e21170b2471e8d5564124876c9517afd (diff) | |
| parent | 7b4b95869e09bce7f08f3dc1382753104e932046 (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: 7b4b95869e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: I8bddeccffdfa8f5f3d09303741843131b963a9bb
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