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)
commit56ff7d9e7384fbf09a73ee61120539b2aa0e1983
tree34d1940d27dcd887550d4eebc1c549033edae051
parent8822f7f6e9c9fc7ecf97ff758d62b4bef5c38178
parentcfbf2261651abba5822b4a2e0213427b298fcb63
Merge "Revert "Remove outdated emulator check which causes BT to not start"" am: 375ea2ae71 am: ebc05de919
am: cfbf226165  -s ours

Change-Id: I278d5afab4e15535dd2fc7b3501f805934e58f28