tree dc8066925562c9a5a93b3a37b69b6d9fefedf346
parent 9ba7608b749f14a332cae4dbc2dd61bb8d08616f
parent 8cd2fbe92f4e6a4df6d6ff47942dce2160bdbf0f
author Bill Rassieur <rassb@google.com> 1554334235 -0700
committer android-build-merger <android-build-merger@google.com> 1554334235 -0700

Merge master@5428150 into git_qt-dev-plus-aosp.
am: 8cd2fbe92f

Change-Id: I7e8f4a6a75f26ab92aac87738fd1b33c90718d44