tree 60eb05f2e88de4fce5c0d1574244d042b1357998
parent be6af9bbc7876a9fc335166780c08b9a7576e8f1
parent b0e34460285c158ad972d7aa3ce34b7bb14c19ec
author Xin Li <delphij@google.com> 1567981195 -0700
committer android-build-merger <android-build-merger@google.com> 1567981195 -0700

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

Change-Id: I4627986fb183fc78e9fdb2ef60ca6a0d334fb816