summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Brad Hinegardner <bhinegardner@google.com> 2023-05-26 19:59:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-26 19:59:49 +0000
commitc92b8f867793150c212d2afcf1ecb6b0fe1974f4 (patch)
treea8cbdd42559f0683ab963b665ea2743b2bc39834 /libs/androidfw/FileStream.cpp
parentc255c630da99992ff39849dd03e022c378f309f9 (diff)
parent1fe8b30f0f5e4cc2965bdd8c5580c504e619939b (diff)
Merge "Fall back to default custom shortcuts if custom shortcuts are disabled" into udc-dev am: 1fe8b30f0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23197030 Change-Id: Ifd73f6a2ce66c38b2bd1259448d735aa5bb238c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions