Skip to content
Commit 9ae385ab authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[automerger skipped] Merge "DO NOT MERGE Respect rounded.xml size in... 

[automerger skipped] Merge "DO NOT MERGE Respect rounded.xml size in ScreenDecorations" into qt-qpr1-dev am: 688ebd68 -s ours am: 547ddb0e am: f4133ec2 am: d0e5ff4a

Change-Id: I5612e1a67475ae81140f40ac2b70e7cf281dd0be
parents 74100e53 d0e5ff4a
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