summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2022-12-07 22:47:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-07 22:47:50 +0000
commit62945c47b9a8b1b46742683367f4dd40e30cbd42 (patch)
treec2a5cd3ae630474557f4b8235c4c195c7eb55f1d /libs/androidfw/StringPool.cpp
parent983196d8ec960b4195067fe3643d09bc82b9048e (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: I8d6ed162de5e0ce585654d37a9b6ed5625b5bcef 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