Skip to content
Commit d8c5ceba authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Parcel only the canonical Uri.Part representation,... 

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

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

Change-Id: Ib423738dd45a03502b5539a7c806701e8668b4ce
parents 5e97bd2a c3d7200b
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