Commit 855928e2 authored by Xin Li's avatar Xin Li Committed by android-build-merger
Browse files

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into... 

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c26793c4 -s ours am: a0ab48b3 -s ours
am: 357becba -s ours
am skip reason: change_id I5d1305694de7dd89a12b59c61507fcaa7cb41d6a with SHA1 465ba7cc is in history

Change-Id: I61a17e95799454c5539bf1de32e85fc6c879e4a5
parents 649304e8 357becba
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment