summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2022-12-07 22:47:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-07 22:47:38 +0000
commit554d8c37a49fc19889abc00657fcf1871cfd7f79 (patch)
tree2451980040d783079739a3c13d857cc9c58fce64 /libs/androidfw/StringPool.cpp
parent45e105c4e04246f5c688b124b1eebc5cdd6d0ef0 (diff)
parent63d803e611eca52bb27d218a2154ce8d2649ba75 (diff)
[automerger skipped] Merge "Implement a global maximum on number of shortcuts an app can publish" into sc-v2-dev am: e51fb72b75 -s ours am: 63d803e611 -s ours
am skip reason: Merged-In I94b4e39475c7585ec67f15df1256fdf0b65f3bec with SHA-1 fa4b2dc6d8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20643109 Change-Id: I410be07f3b2ff332716cec2abedd0851ab64ccb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions