tree bc9b3c02ad3344f036ab6118688ea3224d3f9719
parent 4023b0502073c2d29a0cf0980850e67c364d453b
parent 367167e08119c148815dd88446a611fbc3899e04
author Xin Li <delphij@google.com> 1567979255 -0700
committer android-build-merger <android-build-merger@google.com> 1567979255 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 367167e081 -s ours
am skip reason: change_id I4d381d4cd3be0c07b80afd00af3e46a34aa5fc89 with SHA1 379286bc6d is in history

Change-Id: I92b6a29b059f0fa75a092db0f79228086210f2a3