tree 8deb40bd322e22e8f165eb0656153b8315917403
parent 50bc658e2085da79637f1dbb6570b8afe2f75766
parent 375ea2ae7111d50744f8d06a1db201cadcb4d075
author Colin Cross <ccross@android.com> 1487719952 +0000
committer android-build-merger <android-build-merger@google.com> 1487719952 +0000

Merge "Revert "Remove outdated emulator check which causes BT to not start""
am: 375ea2ae71

Change-Id: I3d5abc52abf3f7c01ba4fbee47d7e487e99f5dda