tree 1820a178f5836588e340e2ce2deddb51aeae0732
parent 4e3c9d88828ec07ed695307fc92c11fb8e1ca584
parent d7e60be747e930dbc417ccb040ef4c9944b9f147
author Xin Li <delphij@google.com> 1572473561 -0700
committer android-build-merger <android-build-merger@google.com> 1572473561 -0700

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

Change-Id: I0a655b3eb36492007b66c0c8c509187b78d59e52