tree 20a31e1e657233e3fe2ebf06acbf1d93edbeae00
parent 6b4b45d1fa3823411baa88995bfe61c04229ca10
parent ad324a3d7e61981dabc00aab83457b071f35fafd
author Xin Li <delphij@google.com> 1568240616 -0700
committer android-build-merger <android-build-merger@google.com> 1568240616 -0700

[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
am: ad324a3d7e -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history

Change-Id: I66d7727341c44123a1083d7833971c7284e786cd