tree 443afd9045c8d3989ce4dac34bd6ebb378b5ddab
parent a93edaaed3203cdd1dcec688afbb8d5a4ac97504
parent 7e153d6ebfb76a568aa9ecf7b96c92f99db988d1
author Bill Rassieur <rassb@google.com> 1554327588 -0700
committer android-build-merger <android-build-merger@google.com> 1554327588 -0700

Merge master@5428150 into git_qt-dev-plus-aosp.
am: 7e153d6ebf

Change-Id: I5e1f2eb619b57bba257ee8a0a8b4b46007c425c3