OSDN Git Service

am f444b341: Merge aaf2e765 from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 4 Nov 2010 17:57:44 +0000 (10:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Nov 2010 17:57:44 +0000 (10:57 -0700)
commit40d0a52a74e2e915f4b595ba6c7afaa7c8e9626d
treef08417d40749b94cbd04adfd31085dacd0f1d257
parent6c798fbf4e89c4058f046a65ee4f9aa5647e43e1
parentf444b341768afcdb3f0934c068f3ead6bafdab78
am f444b341: Merge aaf2e765 from open-source master

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