diff options
| author | 2022-12-21 02:47:19 +0000 | |
|---|---|---|
| committer | 2022-12-21 02:47:19 +0000 | |
| commit | 7e2ee156cf8313f46b6003878fab5059cfa94adf (patch) | |
| tree | 44520986ee48c7fa162bbb34c2527a7308bdf616 /libs/androidfw/ApkParsing.cpp | |
| parent | 5a2b0b82537ea6ab1c0333a4922a954b5ab744bb (diff) | |
| parent | a159635443774fa5ef21a8b03cec7b9c548d88ff (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: fd017d9edd -s ours am: a159635443 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20750216
Change-Id: Ie4160878599221c797b9ae8c67f32dad23c497bb
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