commit | bb4ff2e484a018cecb62013593daf23449899952 | [log] [tgz] |
---|---|---|
author | Pinyao Ting <pinyaoting@google.com> | Thu Dec 08 00:58:28 2022 +0000 |
committer | Pinyao Ting <pinyaoting@google.com> | Thu Dec 08 02:12:06 2022 +0000 |
tree | cd0009071c90a4de9de33d5937c184404c51b2c5 | |
parent | 70f6c1e320257edc37d370ca1f65aedfd03c152c [diff] | |
parent | f9a6a136a08704b63fd4de4e677a9b576bcf8dde [diff] |
[conflict] Merge "Implement a global maximum on number of shortcuts an app can publish" into rvc-dev am: 584d18790a am: f9a6a136a0 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20642213 Bug: 261780479 Change-Id: I6839241b85cf3775fdc81c1befbd1f263fad7313 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>