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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow bar to be transparent... 

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow bar to be transparent during animating." into qt-qpr1-dev am: 6f525258 -s ours am: 758f594d am: c52607dc am: ceaef4bc

Change-Id: If79ec67ffffc6999597298a4320c545a38d1aff6
parents 6fc9da92 ceaef4bc
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