OSDN Git Service

Merge "btif: migrate from pthread locks to std::mutex" am: 84ada302fe am: d88f6a183c
authorMarie Janssen <jamuraa@google.com>
Wed, 12 Oct 2016 16:38:36 +0000 (16:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Oct 2016 16:38:36 +0000 (16:38 +0000)
commit98d8f6136e36c1a9994335ce4a3b93ea865fe9ae
treee23efe704bfb24f8abb633bc3e13faef41a6a24d
parent85cb5d1a33180b08340274c6fa0377db22bd61b9
parent2f351e9cea632417ac30fd383a2f376ae0fbd4f9
Merge "btif: migrate from pthread locks to std::mutex" am: 84ada302fe am: d88f6a183c
am: 2f351e9cea

Change-Id: I50607e319fdd1bb1c88e57835ae2a0418fc5f5bf