summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Aaron Liu <aaronjli@google.com> 2023-08-24 21:22:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-24 21:22:14 +0000
commit6f129c7068e7618392cc94ea44c1118c73a29bb2 (patch)
treeb5704660e86bdb51357785cbe58021ba0bc6718a /libs/androidfw/ConfigDescription.cpp
parenta1714d9b72cc13480e9be5778017aa1d258806ad (diff)
parentf95ef389ae0938e33013470bf3f912ea0b5f9d7a (diff)
[automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: 29ddd8326a -s ours am: 4cd1d533ae -s ours am: f95ef389ae -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24413934 Change-Id: Ie6385a082d25c7e3a8392a890c60b411b84055da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions