Commit 63a016d9 authored by Xin Li's avatar Xin Li Committed by android-build-merger
Browse files

[automerger skipped] DO NOT MERGE -... 

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 5e5ef6cc
am: be4da517 -s ours
am skip reason: subject contains skip directive

Change-Id: If6ff7558a0239e9f92f97eee2fe5d3faba02b1bf
parents 09d2eece be4da517
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