Skip to content
Commit 693ba48b 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

Change-Id: I226422129e0e6a945fbc5953b505d92df39a0c03
parents 98e22d72 758f594d
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