tree 56f101640cdb400eea15c75bf898f253bf5943ef
parent a93c7ebf80a53aca31a5b21915cea0b9ce7dda1a
parent a20839f5d918c4a483a1c0ddf27eee09f2987de6
author Xin Li <delphij@google.com> 1562104305 -0700
committer android-build-merger <android-build-merger@google.com> 1562104305 -0700

[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: 317fc9a2f1 -s ours
am: a20839f5d9

Change-Id: Ie3b14f8ec062de99e9f36222a52b0cb7762efcb1