tree 4de9021f98a57f0b0a27a0cbb384b6d74b6092d5
parent dce54d09c668bd25ae7d9d1dcf6b6991692559cb
parent b2dc05d5f48d40290b36a738a74474185dcc68f6
author Bo Hu <bohu@google.com> 1556829848 -0700
committer android-build-merger <android-build-merger@google.com> 1556829848 -0700

Merge "emulator: disable system-on-root and kernelBlob support" into qt-dev-plus-aosp
am: b2dc05d5f4

Change-Id: Ib3796407e1740e733490d526e2beda253f0f8e59