diff options
| author | 2023-08-08 03:53:16 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:53:16 +0000 | |
| commit | 0f9bff62603905f510d5af9d84dd391980e59c71 (patch) | |
| tree | d72875ddd02a38f67dcb3d4629ea01f1ba7eb2c8 /libs/androidfw/AttributeResolution.cpp | |
| parent | b33de12fbd49d5ace283254c8b40c7c1b936e981 (diff) | |
| parent | 58bfb0db35125727c5969f57237a6071a2e317a0 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b1586 am: 677b43cbc7 -s ours am: 32cd68e6ea -s ours am: 201bb40d90 -s ours am: 58bfb0db35 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063
Change-Id: I0b0f22bcd84d8f877fcf6211c8471d5cf0c1e3c5
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