tree 449c38b6595ef84be9d061b63ab59d0e34313a85
parent 3db6e0c49cb6c5ed8be825fc1b4d89166dd6409e
parent 1272c58d97a55adf57c92b098731c8aa1f3c41ed
author Bill Rassieur <rassb@google.com> 1554337115 -0700
committer android-build-merger <android-build-merger@google.com> 1554337115 -0700

Merge master@5428150 into git_qt-dev-plus-aosp.
am: 1272c58d97

Change-Id: Ia5e8a0f80e90046ec5f23d1872f7d5f3c3ef1831