Skip to content
Commit 9829d71c 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 (5699924) into stage-aosp-master" into stage-aosp-master
am: ca4c520f -s ours
am skip reason: subject contains skip directive

Change-Id: I1a32cee69d0edcb92d81a4bb8e6f98912d86a735
parents 45e4f2e8 ca4c520f
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