| commit | 025e234f56679fe8d66ea0cc97b3b8dd1a4ec656 | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Thu Dec 08 23:22:02 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 08 23:22:02 2022 +0000 |
| tree | 77eda1f309a4c84543ecef095de43e3f85f92a27 | |
| parent | e6a924a66d0e00542ac1a406f0c4012f1d9b5726 [diff] | |
| parent | c6ec6164dc92ce815ae13125693ef4e7956d0c35 [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 am: c6ec6164dc Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20671668 Change-Id: I68fbe768c8b6d9fe1010a3d76037423f3ffae2fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>