tree beaa2a85070d5bc12315e9e4b1a70916f66c5f72
parent 8e8c26e25abcaa1c025519894df08f799592e60d
parent ebc05de919ed4b33f8331b2497f448a43f336c6f
author Colin Cross <ccross@android.com> 1487720221 +0000
committer android-build-merger <android-build-merger@google.com> 1487720221 +0000

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

Change-Id: Id61ee53f3147d90d8fbca053633e3115b69d3065