summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2023-09-29 01:50:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 01:50:21 +0000
commit8b6c78c724053e1c0924d0749c9e75382e54224a (patch)
tree93a16e8c5602b0b5fa252ac701144c866f26124b /libs/androidfw/ObbFile.cpp
parent1d43ff794cf543c99f4535f03f8e69b4a6c98392 (diff)
parentb4c6497849711ad43b575e9318caf54b27b08ae9 (diff)
[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4f2 am: 87de7ffc2c -s ours am: 285b8a1bc9 -s ours am: 79be2c9963 -s ours am: 39abde021d -s ours am: 6b74b34a32 -s ours am: b4c6497849 -s ours
am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e36 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109 Change-Id: I8c9b34afafb28597afd38c887e965d395035c134 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions