Merge "Fix compilation issue when using bluetooth/bluetooth.h in C++"
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Mon, 2 Nov 2015 23:05:11 +0000 (23:05 +0000)
committerGerrit Code Review <gerrit@172.30.200.200>
Mon, 2 Nov 2015 23:05:11 +0000 (23:05 +0000)

Trivial merge