Commit 25bc3b90 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: 713bdaf2 -s ours
am skip reason: change_id Ib0cf39703ffcf1708a59ddea0def3ce127baa154 with SHA1 cdc17eef is in history

Change-Id: I394a359cbeb488b5d7252924b1495d3d48211018
parents 4d388d21 713bdaf2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment