From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 4 Nov 2010 17:57:44 +0000 (-0700)
Subject: am f444b341: Merge aaf2e765 from open-source master
X-Git-Tag: android-x86-7.1-r1~543
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=40d0a52a74e2e915f4b595ba6c7afaa7c8e9626d;p=android-x86%2Fsystem-netd.git

am f444b341: Merge aaf2e765 from open-source master

* commit 'f444b341768afcdb3f0934c068f3ead6bafdab78':
  Include <bluedroid/bluetooth.h> only if HAVE_BLUETOOTH is defined.
---

40d0a52a74e2e915f4b595ba6c7afaa7c8e9626d