Skip to content
Commit 1c5290f2 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-109f7458af5d41ceb727cd78287dfa75" into udc-dev 

* changes:
  [automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-v2-dev am: 04c42b8c -s ours am: 2fd58ff8 -s ours am: 538aed39 -s ours
  [automerger skipped] Truncate ShortcutInfo Id am: fee62a33 -s ours am: 0a632fef -s ours am: 865239da -s ours
parents ace02d1b 84e07454
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment