Skip to content
Commit 4cbfe479 authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

[automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev 

am: 08793a3b -s ours
am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1 a1f79313 is in history

Change-Id: I9094b83959e1f75f90edac095060240c129b73b0
parents 9e376b56 08793a3b
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