summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Brad Hinegardner <bhinegardner@google.com> 2023-05-26 20:21:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-26 20:21:19 +0000
commit82f932534d002f2011b2e94df8de6d7c58951aa4 (patch)
tree6ed194c9c5e665580380dac0e09995156d62d7c2 /libs/androidfw/FileStream.cpp
parent0c5f216942740adb7a4a81357c11c313766ceea4 (diff)
parentc92b8f867793150c212d2afcf1ecb6b0fe1974f4 (diff)
Merge "Fall back to default custom shortcuts if custom shortcuts are disabled" into udc-dev am: 1fe8b30f0f am: c92b8f8677
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23197030 Change-Id: Ib1dfe51440e1a4ffd23d0f5bae392d27aea742a9 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