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

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

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

Change-Id: I8cfc0d65ebe07ca52903e6f7a3570408394e5ad4
parents 0e80b145 c6485251
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