Commit 735e3e18 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: 86ac213c
am: 6feea221 -s ours
am skip reason: subject contains skip directive

Change-Id: Icb134b51a8eb98f81dd539b428f94acbda391ec7
parents 14577d6d 6feea221
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