tree ed52f539f667cce3a18880ccac5853ac1f34a5dc
parent 4ff84cdad32c158b8c5bfc5b121c7c818a187fbf
parent 4b1e75118158297c50f720e31ffabf8e4909eec4
author Xin Li <delphij@google.com> 1567982945 -0700
committer android-build-merger <android-build-merger@google.com> 1567982945 -0700

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

Change-Id: I272e0a384d779128d4b182e03b34abff5d345b7b