OSDN Git Service

Merge "btif: migrate from pthread locks to std::mutex" am: 84ada302fe
authorMarie Janssen <jamuraa@google.com>
Wed, 12 Oct 2016 16:33:59 +0000 (16:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Oct 2016 16:33:59 +0000 (16:33 +0000)
commit2f351e9cea632417ac30fd383a2f376ae0fbd4f9
tree16bb6d5ccb9d0a1eafa80f56c9d911135d0c58af
parent6cfcd7d1dbd8cea46b4d642c1356fb5163cf3047
parentd88f6a183c8c3e4e7ad23283cf5ea09e09ddda82
Merge "btif: migrate from pthread locks to std::mutex" am: 84ada302fe
am: d88f6a183c

Change-Id: I56962683a83454426f1bb35959f3a60a6105c6c5