tree 9b2deb3c2190342c3336b55f4e78bf0edccf8a71
parent 37673bcd682d7b2b6cb9d212dec123f03a031a15
parent 3fe30fa71b5706d96326cc2ecc617e1b9a4c9346
author Lorenzo Colitti <lorenzo@google.com> 1556108655 -0700
committer android-build-merger <android-build-merger@google.com> 1556108655 -0700

Merge changes I84461d40,Ib3ab9105 into qt-dev
am: 3fe30fa71b

Change-Id: Ief0b029527ec71a6744ba2b6a72751e8a5b2bf98