tree eb0eefa815c46414fbeb11b5cb69a78aab1b72cd
parent 12dad59fe30ac2ea6d60c1af0c7d333762bb531a
parent 8735e190012f76d7829caf685910029cb9b80af4
author Xin Li <delphij@google.com> 1565815174 -0700
committer android-build-merger <android-build-merger@google.com> 1565815174 -0700

[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
am: d37b49ab13 -s ours
am skip reason: subject contains skip directive

Change-Id: Ife0b2479362b4554c891fe6be42defbe3f15d427