tree e2879e7949098c7e8388f530828a73f7f6ef82bf
parent 55b6c0505c10d9bcfab2e8e34481fe2a951807db
parent cb377cffb753dc13f71dcb888b2ce9343a6c9fac
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1710367297 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1710367297 +0000

[automerger skipped] Merge "Added throttle when reporting shortcut usage" into sc-dev am: e86f8e00d3 am: f827f1ddf5 am: afdd7b50cf -s ours am: 9edafbe935 -s ours am: 20a49d54bf -s ours am: cb377cffb7 -s ours

am skip reason: Merged-In I96370cbd4f6a55f894c1a93307e5f82dfd394652 with SHA-1 bd88f35c67 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25522017

Change-Id: I430c58af42d7ad56177c8079acaee5f97ae92d02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>