Skip to content
Commit 9c361660 authored by Xin Li's avatar Xin Li Committed by android-build-merger
Browse files

Merge "[automerger skipped] DO NOT MERGE - Merge... 

Merge "[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0172a23b -s ours am: 53f34559
am: 7968cefe -s ours
am skip reason: subject contains skip directive

Change-Id: I13cf454f0d28c49802d001b70d0ce4c889166310
parents 35355827 7968cefe
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