tree 95c4a9523457d2f0b437203e83e5646eac55f471
parent 1e499675761520ffd2bc30c2ba5c15d321753fd1
parent 9f179fcc6b0177773b584e6bd007625da2c48cfb
author Xin Li <delphij@google.com> 1565816877 -0700
committer android-build-merger <android-build-merger@google.com> 1565816877 -0700

[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 8f656270df -s ours am: 23721d6ca6
am: 9f179fcc6b

Change-Id: I8cc8c200776cab2ae3087abcc92f67b867b2ff47