tree 85638668a3b9406d76c0cda27bf78707773ca87b
parent fc9fb216956325de3fb4d369105ebc1bce10e7c6
parent bf3de507117797a00acdd92c3e8d8cfae6d5685f
author Bill Rassieur <rassb@google.com> 1554334887 -0700
committer android-build-merger <android-build-merger@google.com> 1554334887 -0700

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

Change-Id: I684e995988f5a8ef330fbbf55da7ae9230f0cfc2