summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2023-09-28 20:31:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-28 20:31:06 +0000
commit285b8a1bc9568be39cc41d304f377beb3cb21486 (patch)
tree35c7f00c60214fefd857234a044304e38be18802 /libs/androidfw/ObbFile.cpp
parent110f1d8b2669f6a7064b876d890bde0cd8914c77 (diff)
parent87de7ffc2c78ef4c928a4c72e6269f481faac48f (diff)
[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4f2 am: 87de7ffc2c -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: Ie675bd43fc1c7022faa64fa0d66587e279ec0960 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