Commit 153129d2 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 (5699924) into stage-aosp-master am: 6e67c537
am: 5c3be099 -s ours
am skip reason: subject contains skip directive

Change-Id: I77b2daaf56383c12d3e9ccadcf6bb18962e5a037
parents d038809b 5c3be099
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