Commit f621f86f 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: e370a751
am: 10ea32d4 -s ours
am skip reason: subject contains skip directive

Change-Id: I13be2168c9a81288713e1d010d54de24d0aac3e8
parents 6bb7a2f5 10ea32d4
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