Skip to content
Commit 3d62ac87 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: d8c5ceba -s ours

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

Change-Id: Id75dff02c1b2e2410a3797b67143cd30321c86b1
parents f9e32b50 d8c5ceba
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