diff options
| author | 2022-12-16 02:39:29 +0000 | |
|---|---|---|
| committer | 2022-12-16 02:39:29 +0000 | |
| commit | ff4401e3f241778679b4182e8bbb233a40cc0ae4 (patch) | |
| tree | 2aa214672c1d213077074f0e25aac56156422208 /libs/androidfw/StringPool.cpp | |
| parent | 9b7885efbcaa630421b2d08198a52f0cd2e323e7 (diff) | |
| parent | 4e1e8a0456b56f6dbfe97b080787678f2670b3b1 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20749901
Change-Id: I61ef5e3fb4b851bd8e8169e1bfb1c6176bdbca88
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