diff options
| author | 2023-08-25 20:32:17 +0000 | |
|---|---|---|
| committer | 2023-08-25 20:32:17 +0000 | |
| commit | cf50fbe46230baae2a3789ac57613ac126ca1e5c (patch) | |
| tree | e3fbac87d365754f09ad6f04e2242218217cb4a4 /tools/aapt2/ResourceParser.cpp | |
| parent | 58ea057e6f0659c24a4e1e0e013fc6f633f30f42 (diff) | |
| parent | 8c67e1364e9b96756054718ea048e6fcaf5cb1d8 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Unset StrongAuthFlags when unlocking a user profile" into tm-dev am: 5233950a66 am: 7fe090e659 -s ours am: 75a5bd2d00 -s ours am: 8c67e1364e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24270326
Change-Id: Ie9695793498d2a3bf96bbd60cefa10066a89e06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions