tree c58c05c0c57615d914cddddac0c93e0b15bca397
parent 1c76305b5a7260cd368adff4fee06195f2af2457
parent 442cc0329898adce522962e4c895189891f7b28a
author Bill Rassieur <rassb@google.com> 1554335784 -0700
committer android-build-merger <android-build-merger@google.com> 1554335784 -0700

Merge master@5428150 into git_qt-dev-plus-aosp.
am: 442cc03298

Change-Id: Icfcdef66f2f1d74becdb358d3cc827de339a3cda