summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-12-22 21:34:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-22 21:34:02 +0000
commit21ce858e1f7e7dd5f075d37128b4f1f6c7ed2dda (patch)
tree649ffee37946fcdb8849369591bbe02fcb3ea8d4 /libs/androidfw/ConfigDescription.cpp
parent9240b791e47b92e90d7574d3fb97782e71312134 (diff)
parent4aea16bab37a1dbc3fb46aa98ab5860c75e1a57f (diff)
[automerger skipped] Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into sc-dev am: 7ce81bda11 -s ours am: 7de9ed79fc -s ours am: 3f1534eb77 -s ours am: 5b6d285de8 -s ours am: 4aea16bab3 -s ours
am skip reason: Merged-In I1d7c265160389e45cf57a4bf8ce756376068d5b7 with SHA-1 a8047ca3df is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20750339 Change-Id: Icba225bd3e0e7243f6b2e2d736fd8962b5f659f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions