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

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 

am: d57e959e -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2 is in history

Change-Id: I6c6c0cd8aa4ac5968252f29c1e45f0e0768f5204
parents 172d31f8 d57e959e
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