tree f80a64336a9f71c258aa53a7780ea54c787e7044
parent 417dca3310fd2e561757d298dcf848c348d29e50
parent 870e0a7b7e66f1a5518adf67f80b5d69cea55075
author Xin Li <delphij@google.com> 1565921866 -0700
committer android-build-merger <android-build-merger@google.com> 1565921866 -0700

[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master am: cc3e2f8a6e -s ours am: 28c265faa2 am: 49f3c17e52
am: 870e0a7b7e -s ours
am skip reason: subject contains skip directive

Change-Id: Ie3f580acfc2772a3f716329297a948828b6106f4