[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev
am:eac42583a1
-s ours am skip reason: change_id I58f0287ed99a4daf3758316e4004bca05f17b0d1 with SHA1ea79e343f0
is in history Change-Id: I80f853b777590b66aa8689e36864b381a947cb72
This commit is contained in: