diff options
| author | 2023-01-11 21:25:39 +0000 | |
|---|---|---|
| committer | 2023-01-11 21:25:39 +0000 | |
| commit | 4433e5df283a48966248c871937afa4f25b32e35 (patch) | |
| tree | 8a0a74f9804293280cdfeea504e8b61cc9d30cf0 /libs/androidfw/ApkParsing.cpp | |
| parent | d7804792ca5f83dbfaae2b86c3bd3981c2a5db84 (diff) | |
| parent | 08e45949832dbd4511da717d087aac51b258f527 (diff) | |
[automerger skipped] Merge "[Do Not Merge] Revert "Implement a global maximum on number of shortcuts an app can publish"" into rvc-dev am: 28dae0e4c9 am: cf3f62c4c9 -s ours am: 7a31586c29 -s ours am: 15dbdb2a73 -s ours am: 7e1bf5b798 -s ours am: 85671779f6 -s ours am: 08e4594983 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20750216
Change-Id: I1cf1288bae9569325ff8b676015c0591639402da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions