diff options
| author | 2022-12-16 01:59:15 +0000 | |
|---|---|---|
| committer | 2022-12-16 01:59:15 +0000 | |
| commit | 4e1e8a0456b56f6dbfe97b080787678f2670b3b1 (patch) | |
| tree | a14a34d70498c35bea279e8595ae3b81a3ddb4cc /libs/androidfw/StringPool.cpp | |
| parent | 07639f691a138ba15ddd1b6c5411f2c730a74cab (diff) | |
| parent | 0200a32954a3a83f705cdaee46ce2b5186ec1be1 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20749901
Change-Id: Ib332e24258160e265e7463822d5482dd0230c06a
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