tree 28046dd631ccf121fc06482e067ba49dc44207b1
parent ef8f99fbadeeaa5afe9a936ac489e32901bb1f8f
parent 4e6417a203cace4cfdb1c9fd33fe68165baf2e10
author Xin Li <delphij@google.com> 1567982022 -0700
committer android-build-merger <android-build-merger@google.com> 1567982022 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 4e6417a203 -s ours
am skip reason: change_id I17ba1e731bd403ec39551ccbae7b7a614415844e with SHA1 e0f4c66701 is in history

Change-Id: I6180a566c9a34ee6dc68bfc299ea036e75165867