tree 0832b1592aa8200e0d8b30639bfea5813030a20d
parent dcb60ccdb882a32655f10442a359990c574d5d4f
parent bc51e39b789b363c63d76023c2d78d42c56973b0
author Xin Li <delphij@google.com> 1562087195 -0700
committer android-build-merger <android-build-merger@google.com> 1562087195 -0700

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: bc51e39b78 -s ours
am skip reason: subject contains skip directive

Change-Id: I83202139e6dc0eaadaa7f51a8cec5fa080faefca