tree 527217c7b143d5b774db00b6ea84cf322ff47016
parent e115b7cbbc400063afbd657c946f1744e961545c
parent 1b072db26fac5f22bcc82171cb887cbf8cd2eed2
author Kai Wang <kwangsudo@google.com> 1561184259 -0700
committer android-build-merger <android-build-merger@google.com> 1561184259 -0700

Merge "Update VHAL emulator" into qt-dev am: 993203db5d
am: 1b072db26f

Change-Id: Iec037aafc5a9992ab0198777809dad16e842d805