summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2023-08-02 16:52:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-02 16:52:53 +0000
commit7d3c6927c53b043d81de653a30675647382df2dd (patch)
tree46dcf114e763065b4de72ca53365767c94940991 /libs/androidfw/AssetsProvider.cpp
parent8b8ad4d10db3290485fd67ed20f19842c3f8de83 (diff)
parent63d6f37167af099142c4890ca41580c2ccebd664 (diff)
Merge "Don't show lockscreen after using bouncer" into udc-qpr-dev am: 7b9199ced0 am: 63d6f37167
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24284489 Change-Id: Ib6ae80e651382b752bc971122515cbaff58c9e41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions