| commit | c6ec6164dc92ce815ae13125693ef4e7956d0c35 | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Thu Dec 08 05:30:39 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 08 05:30:39 2022 +0000 |
| tree | 1add35725df5b6a60ee2663b408a566862d397e8 | |
| parent | 18917a1820d3f2b9a376773611707c999933a592 [diff] | |
| parent | 891d482fb6b40c484e7c6b8660733682dc36f2b8 [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 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668 Change-Id: I148aa61a3b91bdb12bc14413ee05e744a37ac921 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>