| commit | 2e63855f5ca72e592466dd15fa466bbf1b3d340e | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Thu Dec 08 23:44:58 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 08 23:44:58 2022 +0000 |
| tree | 5f2c7f76126eb1b413fbae69d41754413d6c69fa | |
| parent | 5ba8d5c6299c08a63c507ee1f400fa817685a118 [diff] | |
| parent | 025e234f56679fe8d66ea0cc97b3b8dd1a4ec656 [diff] |
[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 am: 891d482fb6 am: c6ec6164dc am: 025e234f56 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668 Change-Id: I4183e02e94da8d94d378cb3c196d151af92449af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>