[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 am: eee3312ac2 am: 4611aa5717 am: 69042ba58f

Browse Source

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668

Change-Id: I876efc00a31f2edee1f6ea384806acf5f31a3b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Pinyao Ting

2022-12-08 05:07:23 +00:00

committed by Automerger Merge Worker

parent 36e0097bb4 69042ba58f

commit 1bf12f380f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available