Commit d8a5cac0 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: d8873bc2
am: 060c8382 -s ours
am skip reason: subject contains skip directive

Change-Id: I58a639bd1d35b7bb4851b8d4669dd9836ae109b1
parents 4b86bec8 060c8382
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