Merge changes from topic "am-a2ca728fc00e433591b8b2fe31d914d7" into tm-qpr-dev-plus-aosp
* changes: Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into sc-qpr1-dev am:d7133ae51eam:a0b9c69054am:bdaf7f7133am:f2541388f9am:f04a5814f5[automerger skipped] [automerge] [Do Not Merge] Ignore malformed shortcuts 2p:36338a3152am:a536efe21e-s ours am:7aec23bf3f-s ours am:3841f5c1e1-s ours am:e175292611-s ours am:feb60aa8c6-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
1bc9579c16