Skip to content
Commit d0e5ff4a 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

Change-Id: I40287d8bc006408137ae272b331c909ce36ef518
parents f70ea0aa f4133ec2
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