| commit | 891d482fb6b40c484e7c6b8660733682dc36f2b8 | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Thu Dec 08 05:07:46 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 08 05:07:46 2022 +0000 |
| tree | 293bc9a8f52fe65fff088e00ae1694e75c56ef0d | |
| parent | 03b55f7fa7d29856d77bee8cdbb7b01d4f62d90a [diff] | |
| parent | 69042ba58f837dc32ad0289e0c53c8c20f5c7d10 [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 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668 Change-Id: Ie7ef157b93892ef01774aa6f84580e300c780247 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>