tree 7c4e6b50ce213f36f8022d47aac173226df721ba
parent 40ca727062bbe76658675f30e2d37316fa1dfaaf
parent 40f8906f4561b440cf56596d087b7493282d75e8
author Michael Gonzalez <michgonz@codeaurora.org> 1574111120 -0800
committer android-build-merger <android-build-merger@google.com> 1574111120 -0800

Merge changes Iba1c82b0,Ia498f6dd,I16fd11f5 into qt-qpr1-dev
am: 40f8906f45

Change-Id: I9b04911a766ea0f3d08c7d05278a2bd67dedd9ac