Skip to content
Commit 94e0e3f9 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 am: 6aff534f

Change-Id: I9bf34e7d42205721a5614bda8e7ba87a5ada80ab
parents 1d6822df 6aff534f
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