Skip to content
Commit 290fb2fd authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev 

am: fd485887 -s ours
am skip reason: change_id Ic3a4ba793db7f1361678ef51c411d9eab85d9b85 with SHA1 8e10394c is in history

Change-Id: I9a3a503f58807eaa2c57b291f6ee416f7aec4fa2
parents cd1787c5 fd485887
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