summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-12-16 03:21:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-16 03:21:43 +0000
commitb223c2519c876fcc45acde968edaa1a0b1817832 (patch)
tree75369a82cb85f8693127ef5ea54cd68800e25c88 /libs/androidfw/StringPool.cpp
parent616e301f1a8298a4adcf54fd80a437277496903d (diff)
parentff4401e3f241778679b4182e8bbb233a40cc0ae4 (diff)
[automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-v2-dev am: b99b78291b -s ours am: 730e786b73 -s ours am: 0200a32954 -s ours am: 4e1e8a0456 -s ours am: ff4401e3f2 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20749901 Change-Id: I5502209a817c9daed6dfbfcd7cfa0c4f2380444a 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