summaryrefslogtreecommitdiff
path: root/libs/androidfw/misc.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2023-09-29 05:01:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 05:01:13 +0000
commit5a8fd865b96e3c4c39ece5ad9b3afcea750bb522 (patch)
tree92d0190fef6613474878c7c0a27e35b873a124cf /libs/androidfw/misc.cpp
parent6b62ae8132bc92886d537e7965b253d46e1002d4 (diff)
parent655266f89fcb2d04a60fd886d12bb56f6329f815 (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: a2afc42c9d -s ours am: d06e0acf00 -s ours am: 4d8bb9afc5 -s ours am: 655266f89f -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: Ieb780970be333ac9703952d25738c2d64db46cc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/misc.cpp')
0 files changed, 0 insertions, 0 deletions