tree c93704f071449f8d14db9a2c768b4ad951ef721d
parent a791dd91d24a9b38b5fec9c4dca3266defd03a28
parent a0f3a8d97d5a97efecbba14a16646e69166a5a8a
author Bill Rassieur <rassb@google.com> 1554333337 -0700
committer android-build-merger <android-build-merger@google.com> 1554333337 -0700

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

Change-Id: I037fa82b522c9c9d80c4162de45ae6aaa2b80fd0