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

am: cfbf226165  -s ours

Change-Id: I278d5afab4e15535dd2fc7b3501f805934e58f28
This commit is contained in:
Colin Cross
2017-02-21 23:42:06 +00:00
committed by android-build-merger

Diff Content Not Available