tree eda95b762e1076f7f75b5f8834b5f86ac8b1137d
parent 83f4ac4571b553991e2acab33337205d8b323c15
parent 7e80e05030056317d3d9b61ae5692b43c2c1772d
author Miao Wang <miaowang@google.com> 1558660364 -0700
committer android-build-merger <android-build-merger@google.com> 1558660364 -0700

Merge changes I430ecb8a,I611a92ef into qt-dev
am: 7e80e05030

Change-Id: I2c456e3c9d81ded8d661f93dcbd4162a06a04c7a