commit c0c799c6609e2810259759ad070cab9a143db272
author The Android Open Source Project <initial-contribution@android.com> Fri Jul 02 12:09:18 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 02 12:09:18 2010 -0700
tree 497db31ef431912691677be74c86110aed2b15c2
parent 64e76cc63716b2ae844587c6567a0fc05bd37abd
parent 0796f618775b34e14ff624bcfca828d55183b4c5

am 0796f618: merge from open-source master

Merge commit '0796f618775b34e14ff624bcfca828d55183b4c5'

* commit '0796f618775b34e14ff624bcfca828d55183b4c5':
  DBUS is not fully implemented. Disable it for now

include/arch/target_linux-x86/AndroidConfig.h

diff --git a/include/arch/target_linux-x86/AndroidConfig.h b/include/arch/target_linux-x86/AndroidConfig.h
index b9800dd..2152d6a 100644
--- a/include/arch/target_linux-x86/AndroidConfig.h
+++ b/include/arch/target_linux-x86/AndroidConfig.h
@@ -227,7 +227,7 @@
 /*
  * Define if we have Linux's dbus 
  */
-#define HAVE_DBUS 1
+/* #define HAVE_DBUS 1 */
 
 /*
  * Define if tm struct has tm_gmtoff field