tree 6e062705a57a7350c9db2014da5893820a2cbfc5
parent 1f61e03b09ac5ae82169a24f9639fe33df0f586e
parent 97559d9bd8eebc5d303a0a2d6ac14014aa526638
author Joseph Pirozzo <pirozzoj@google.com> 1559142467 -0700
committer android-build-merger <android-build-merger@google.com> 1559142467 -0700

Merge changes I4a47d83c,I72d4e344 into qt-dev
am: 97559d9bd8

Change-Id: I0f257af7281cd0d246b9e60d102399de230332f5