merge from open-source master

Change-Id: I1be135f087795bf1789dbf911c585a606bf25778
This commit is contained in:
The Android Open Source Project 2010-07-02 11:45:02 -07:00
commit 0796f61877
1 changed files with 1 additions and 1 deletions

View File

@ -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