OSDN Git Service
(root)
/
android-x86
/
system-netd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6c798fb
f444b34
)
am f444b341: Merge aaf2e765 from open-source master
author
Jean-Baptiste Queru
<jbq@google.com>
Thu, 4 Nov 2010 17:57:44 +0000
(10:57 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 4 Nov 2010 17:57:44 +0000
(10:57 -0700)
* commit '
f444b341768afcdb3f0934c068f3ead6bafdab78
':
Include <bluedroid/bluetooth.h> only if HAVE_BLUETOOTH is defined.
Trivial merge