tree 319a18bcee1689daad880e62848e306a0051eb34
parent 1f601c45c1b3471f3d652f8b8015a2e575e3ecc2
parent 2a034c9230644813391212e4129de771e587fde1
author Bill Rassieur <rassb@google.com> 1554334379 -0700
committer android-build-merger <android-build-merger@google.com> 1554334379 -0700

Merge master@5428150 into git_qt-dev-plus-aosp.
am: 2a034c9230

Change-Id: Ib480e7df7263d38b08e8ffaa3609d5917234631e