Skip to content
Commit 74100e53 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: 4e7cd790

Change-Id: Ib0e971477b0412c70e9c59e90c05657d1fcf7877
parents 589e9f02 4e7cd790
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