tree e0c302a5f582aaeaf34a6f09a7ba912afcbb3681
parent 84c03ede3c79119983e7621915776c0a41c9b468
parent 63879f189c5750b91132e388466976cbb8f0f1a0
author Bill Rassieur <rassb@google.com> 1554335533 -0700
committer android-build-merger <android-build-merger@google.com> 1554335533 -0700

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

Change-Id: I3f2335624a28ac0a0980380995cb686801aee80f