OSDN Git Service

Merge "Revert "Remove outdated emulator check which causes BT to not start"" am:...
authorColin Cross <ccross@android.com>
Tue, 21 Feb 2017 23:42:06 +0000 (23:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Feb 2017 23:42:06 +0000 (23:42 +0000)
am: cfbf226165  -s ours

Change-Id: I278d5afab4e15535dd2fc7b3501f805934e58f28


Trivial merge