Skip to content
Commit 537554f3 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

[automerger skipped] Merge changes... 

[automerger skipped] Merge changes If7d41052,I66f263d7,Id45ae956,Iba752fed,I575a7e4f, ... into qt-r1-dev
am: f80234a9 -s ours
am skip reason: change_id If2ef8d8f038f32c8cf974aa02cfc1dc7e44dbad3 with SHA1 8c9d8c5e is in history

Change-Id: I5b525feb1e7df2a89dea4f38b521973ccaac0746
parents 6b1c7ced f80234a9
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