Commit a0ab48b3 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: c26793c4 -s ours
am skip reason: change_id I5d1305694de7dd89a12b59c61507fcaa7cb41d6a with SHA1 465ba7cc is in history

Change-Id: Ib5f58dcbf26dfb65880a16400ee07fe15b39ae57
parents fb336e99 c26793c4
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