tree 5e71ae1bdd5dba10c1a6f34c977910fabaf8e8ef
parent 329910c0ff6936399bd4f2cc2ac54046b62e0871
parent 4e087a7ea5903d69743d404d41425f9e994b5c7e
author Xin Li <delphij@google.com> 1562107449 -0700
committer android-build-merger <android-build-merger@google.com> 1562107449 -0700

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

Change-Id: I55b0e309e90f5d94c2a7d31500ad0a4adc538d3e