Skip to content
Commit bf129931 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: e236f78f am: 563e51b4
am: ee1cdc61 -s ours
am skip reason: subject contains skip directive

Change-Id: Icb9ec1c68a656e42280663a3c06f567cb26a4090
parents 9dbb38cb ee1cdc61
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