Commit 40f17968 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: af68f9cf -s ours
am skip reason: change_id Ie634ae39988b953a9256d2dcd277ff18514fb7f8 with SHA1 b07fe514 is in history

Change-Id: Ib37b8fa31335e1dbaec215bca0771d01b36d19d6
parents a04f6758 af68f9cf
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