tree c42a90aacfe1c07af564ada7ea03e559767ab543
parent 20d571cc4c24210939932b53f8119b98fd45ebe5
parent f14bef8033d6d6ffdfd194dfad357d3283830b97
author Xin Li <delphij@google.com> 1562096799 -0700
committer android-build-merger <android-build-merger@google.com> 1562096799 -0700

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

Change-Id: I9f693b256eff33fdf3d8614c3eb35e4c2d9e107f