tree fd26782cbbf4c73650f8c5b42ebcb2b2e2b2be10
parent a7883b52840b4c2412f296e03722abaff64cab47
parent 4f9420710ce34b38007db013600c5aed4928f93c
author Bill Rassieur <rassb@google.com> 1554333684 -0700
committer android-build-merger <android-build-merger@google.com> 1554333684 -0700

Merge master@5428150 into git_qt-dev-plus-aosp.
am: 4f9420710c

Change-Id: I2c6527592aa747ac6744094f2fcc0d431cd86ed4