tree 496be141e3036ad787eaacd335437070e74df335
parent 0efc31864ba7d0bfff01ffcc654af5573834ea37
parent f7838c64ecc6b5dd4f0ec326fbec222d6ca714b1
author Xin Li <delphij@google.com> 1562096322 -0700
committer android-build-merger <android-build-merger@google.com> 1562096322 -0700

DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: f7838c64ec

Change-Id: Ic6d206ae7b2ee88616ef5b5b264a34c7d8fc691a