summaryrefslogtreecommitdiff
path: root/libs/androidfw/misc.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2023-09-29 04:02:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 04:02:07 +0000
commitcf11a6193f676024bb5a30625ed4a300cfbda59c (patch)
tree437fc6e0abcda691db1c4a10719ba05558bc4e96 /libs/androidfw/misc.cpp
parent85a23a76385731774e173898899ff06fdb83cd7c (diff)
parentae621908fd12dce514af28c879aaf56d51e269ec (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: 8b6c78c724 -s ours am: 4420eab741 -s ours am: ae621908fd -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: I77c00b27c7f9f5cc492905d3b708d36e9217f4b1 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