[automerger skipped] Merge "Parcel only the canonical Uri.Part representation, not both." into qt-qpr1-dev am: 7a9c03e529 -s ours am: c3d7200b6a -s ours am: d8c5ceba97 -s ours

am skip reason: Change-Id I2bc2008e49de5a66641ecdbd8e5354dfa647269d with SHA-1 c9afa38f97 is in history

Change-Id: Id75dff02c1b2e2410a3797b67143cd30321c86b1
This commit is contained in:
TreeHugger Robot
2020-03-23 20:47:59 +00:00
committed by Automerger Merge Worker

Diff Content Not Available