tree bb50b2476df0d3f3cf36c9cbdd2b1983d793f4d9
parent e0b8f9b5f376af72b638905e03b3ac69b7db4107
parent 28e3866d875e02b8cba2d30caf3fafd4a3de2e3b
author Xin Li <delphij@google.com> 1572470629 -0700
committer android-build-merger <android-build-merger@google.com> 1572470629 -0700

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

Change-Id: I4ccdfa974b002f5e03b4fd7fa48e6e1ccdcf6cce