tree fbe0b0e3a486a627bf8727180f7e7ddbf160d800
parent 6fd8108679b80765bb237abe7d6cfb751dcfe0c6
parent 6b2681521e923f065ea2534aeeb222e3c02cb0b5
author Remi NGUYEN VAN <reminv@google.com> 1559233569 -0700
committer android-build-merger <android-build-merger@google.com> 1559233569 -0700

Merge changes I2cb4200b,If1fa00be into qt-dev
am: 6b2681521e

Change-Id: Ib279a80a19bcdaf53678921108c4932d04988474