Commit 5f543743 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: 3347cf4c
am: cae9aeff -s ours
am skip reason: subject contains skip directive

Change-Id: Ie5ff89ed3196a9b0c1f45a3f7e477df718cf194a
parents 28cb5332 cae9aeff
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