tree 82e9582316f08258e5e935001680a773b0bee57b
parent c3ceb9af840485e4c0f9a05f453408855460a515
parent 466b098b87de5a083da5f7dc171c647860a9195a
author bohu <bohu@google.com> 1517812583 +0000
committer android-build-merger <android-build-merger@google.com> 1517812583 +0000

Merge "emulator: not start adbd upon ro.kernel.qemu=1" am: 7c271bdc3b
am: 466b098b87

Change-Id: Ic97d252da93210530746f131c2d6fab073cc8fde