tree c93d4001c5aa39e601f10ce60babdb5a769f1caa
parent e858e2fe81d33eab6988ced4319a485ca97370ee
parent 2e3532fa96538ceab9d0a3c5b31a41de553bd927
author Xin Li <delphij@google.com> 1565815376 -0700
committer android-build-merger <android-build-merger@google.com> 1565815376 -0700

[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 1ba485fbde -s ours
am: 2e3532fa96

Change-Id: I081ef878951db254170e2d9a7b72c0eacb36a66a