Skip to content
Commit 70e2f947 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "DO NOT MERGE use left/right insets instead of... 

[automerger skipped] Merge "DO NOT MERGE use left/right insets instead of cutout" into qt-qpr1-dev am: 820aa463 -s ours am: df6a67cc

Change-Id: I35c05de752a87c9f923c94273f8726d0ae9aec2b
parents 36fdaed6 df6a67cc
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