tree afae83ccd15be32ce5b978b617b34251fd149fff
parent 96b4cc9415cfe761d8d78b5dba83f05a51e2bcdc
parent 67f647ee7a8f0eb0ba1d668cc8287a79af61259b
author Xin Li <delphij@google.com> 1567979560 -0700
committer android-build-merger <android-build-merger@google.com> 1567979560 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 9e4f79f5ff -s ours
am: 67f647ee7a -s ours
am skip reason: change_id I0cddc58644ab80a4e10b52d9df8c7ecdecce2519 with SHA1 8338a4e720 is in history

Change-Id: I48b22c6b9fe5e8bf4559bea03549a12adf7167e7