Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1

Author: Tom Taylor

core/java/android/provider/Telephony.java

@@ -1271,9 +1271,6 @@ public static long getOrCreateThreadId(
 
             Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
                     uri, ID_PROJECTION, null, null, null);
-            if (DEBUG) {
-                Log.v(TAG, "getOrCreateThreadId cursor cnt: " + cursor.getCount());
-            }
             if (cursor != null) {
                 try {
                     if (cursor.moveToFirst()) {