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

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor... 

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
am: 1e1d3c87 -s ours
am skip reason: subject contains skip directive

Change-Id: I3bbbadb9a5e572eeabb78e16474578ae24dfaed1
parents 1801ce88 1e1d3c87
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