tree afae83ccd15be32ce5b978b617b34251fd149fff
parent b82fd0c2efc158dd65228de55e2d7b1e5105dc59
parent 9e4f79f5ff77be4af507e02443a92597f96284e4
author Xin Li <delphij@google.com> 1567978338 -0700
committer android-build-merger <android-build-merger@google.com> 1567978338 -0700

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

Change-Id: I0c7eeef2ca93d9b57b47ac7a06110889bd743a0c