Merge changes from topic "am-16951e85df6d42e5b2530da903446616"
* changes: [automerger skipped] Merge "Implement a global maximum on number of shortcuts an app can publish" into sc-v2-dev am:e51fb72b75-s ours am:63d803e611-s ours am:62945c47b9-s ours am:9507b44655-s ours am:db3c399fc8-s ours [automerger skipped] Implement a global maximum on number of shortcuts an app can publish am:7622d6da0e-s ours am:800028ab88-s ours am:983196d8ec-s ours am:654a4b35a2-s ours am:3598883b9a-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
798a248e0a