summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2023-08-02 16:11:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-02 16:11:25 +0000
commit63d6f37167af099142c4890ca41580c2ccebd664 (patch)
tree8c571f3100073b394401374d49c7b83f2a54227b /libs/androidfw/AssetsProvider.cpp
parentabd4658c5099d34cb04944ff076c7ed094ff7b01 (diff)
parent7b9199ced02b899c2643661a82f4e921bc4429f4 (diff)
Merge "Don't show lockscreen after using bouncer" into udc-qpr-dev am: 7b9199ced0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24284489 Change-Id: I8ffb3b32e81a133555d8b1cc629ceaa1379d4838 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