diff options
| author | Nick Pelly <npelly@google.com> | 2009-10-14 12:03:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-14 12:03:19 -0700 |
| commit | 52cb8557525c1b25163cd5e4ad317a7a64119aae (patch) | |
| tree | 9dedd85e670c7b2ee8fdf18d7139a4d176b05357 /core/jni | |
| parent | 25415e2b9c80050525a0ebd51cecdaa5b1396674 (diff) | |
| parent | a04ca9b489ce0e92fa156f8ce26459a463b3e085 (diff) | |
| download | frameworks_base-52cb8557525c1b25163cd5e4ad317a7a64119aae.zip frameworks_base-52cb8557525c1b25163cd5e4ad317a7a64119aae.tar.gz frameworks_base-52cb8557525c1b25163cd5e4ad317a7a64119aae.tar.bz2 | |
am a04ca9b4: Merge change I2492bffe into eclair
Merge commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085' into eclair-mr2
* commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085':
Remove STOPSHIP comment.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_server_BluetoothEventLoop.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/jni/android_server_BluetoothEventLoop.cpp b/core/jni/android_server_BluetoothEventLoop.cpp index 62a50e5..f77e5da 100644 --- a/core/jni/android_server_BluetoothEventLoop.cpp +++ b/core/jni/android_server_BluetoothEventLoop.cpp @@ -735,8 +735,7 @@ static DBusHandlerResult event_filter(DBusConnection *conn, DBusMessage *msg, return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - // STOPSHIP: Change to LOGV - LOGE("%s: Received signal %s:%s from %s", __FUNCTION__, + LOGV("%s: Received signal %s:%s from %s", __FUNCTION__, dbus_message_get_interface(msg), dbus_message_get_member(msg), dbus_message_get_path(msg)); |