tree 5ed13f83178186fb29afce752b6c6d78a2ab623a
parent a81eeeff14d372e136bec7047fd8379ef5dd1e2d
parent 5487e82df5a51de2960aac5bf012648b6d0c40ab
author Xin Li <delphij@google.com> 1565912196 -0700
committer android-build-merger <android-build-merger@google.com> 1565912196 -0700

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

Change-Id: I31a24ffd3834839da5aafb9419d7480febbb4bde