tree 78e86640c6d23a6fb5e69a659077d9f5d56d5514
parent 107b4e21e6d83892d047832eea7e8bcd542b679a
parent 3cd28db90a6421187338e6c44b4b884af8790dd6
author Bill Rassieur <rassb@google.com> 1554334210 -0700
committer android-build-merger <android-build-merger@google.com> 1554334210 -0700

Merge master@5406228 into git_qt-dev-plus-aosp.
am: 3cd28db90a

Change-Id: I6556ed4a19f2ff18ae4c0b8de93c37209a4e1e60