Commit c10a1887 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: af68f9cf -s ours am: 40f17968 -s ours
am: 3a2d2610 -s ours
am skip reason: change_id Ie634ae39988b953a9256d2dcd277ff18514fb7f8 with SHA1 b07fe514 is in history

Change-Id: I1f9c74fdab5ab236a93dd80e42d6e40ae134316f
parents 945110ee 3a2d2610
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