| commit | 4611aa57174954a0d3a2d819ddb279912e25a6e1 | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Thu Dec 08 04:14:17 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 08 04:14:17 2022 +0000 |
| tree | 061d550902d76d68fa884226bb965ff011179cb3 | |
| parent | e51fb72b750b8852ec45f9f0aa8c80e4b8306e35 [diff] | |
| parent | eee3312ac2b207aa9588d054acbcee73ba68caea [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 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668 Change-Id: Ic59fb429f1b0d87d45282515e7a8eea1d022fcf9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>