| commit | eee3312ac2b207aa9588d054acbcee73ba68caea | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Thu Dec 08 03:23:38 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 08 03:23:38 2022 +0000 |
| tree | cd583f8f58111d47526e3f601dc6d4c02e53c619 | |
| parent | ff8dbfb35471b35b2aff59b65523254841dfda1d [diff] | |
| parent | bb4ff2e484a018cecb62013593daf23449899952 [diff] |
[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 am: bb4ff2e484 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668 Change-Id: I161301167ce9d467b47cc709a34ec304696afb12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>