tree d97f6b944537b6b52a117b4e5ab702a055386015
parent d8c0c9ea05d4798dc8c9adcdc3a3d0c52fb17fd3
parent a0aa088c9f47ba31979f71df2dfc3ac38293ffda
author Selim Cinek <cinek@google.com> 1561852147 -0700
committer android-build-merger <android-build-merger@google.com> 1561852147 -0700

Merge changes I089fa8ff,I8db745c1,I6fa83189 into qt-r1-dev
am: a0aa088c9f

Change-Id: I6d97a64ad21a4125761da9a833ca4bf0654e7642