summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2022-12-07 23:50:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-07 23:50:40 +0000
commit47bef657953ebdb11687005bfd28bf6082454297 (patch)
treeff64bd88c49d7218d82807ccd1b87ad15ea045c5 /libs/androidfw/StringPool.cpp
parentf8bc8b2aad0c34864155a59e790dcd34d6484c76 (diff)
parentdb3c399fc86b7993cf8672ba3432194d96c0d3ed (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: 62945c47b9 -s ours am: 9507b44655 -s ours am: db3c399fc8 -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: I106530ef777dde4bad98795faece1429115a8a7d 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