| commit | 69042ba58f837dc32ad0289e0c53c8c20f5c7d10 | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Thu Dec 08 04:35:40 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 08 04:35:40 2022 +0000 |
| tree | 06b3ab63bf851a564bdf7a6afa2c86f0a4b722a8 | |
| parent | 3a2ffd7e0dbfec05b08f11da05c748fc69a1d50c [diff] | |
| parent | 4611aa57174954a0d3a2d819ddb279912e25a6e1 [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 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668 Change-Id: I9c8cc614d89d1405d922781a5cd7ce6ea12db053 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>