Skip to content
Commit 6aff534f 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: 96ce6a1f

Change-Id: I76d641025ce95bda7323c8c571a7d1a62228e8a9
parents f70ea0aa 96ce6a1f
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