Skip to content
Commit 547ddb0e 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 skip reason: subject contains skip directive

Change-Id: I0e6c482e042e14f1b1eddd284fbd7a98dca574ce
parents 14ebab3b 688ebd68
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