Partial revert of r9936.

talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java

Index: talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
diff --git a/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java b/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
index 5b623ce143a9f5a8340440de8b5141dfc887dba9..c8f9a30024e97f40ba039f803e6b4178eba7b80b 100644
--- a/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
+++ b/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
@@ -29,17 +29,14 @@ package org.webrtc;
 
 import static java.lang.Math.abs;
 import static java.lang.Math.ceil;
-
 import android.hardware.Camera;
+import android.util.Log;
 import android.graphics.ImageFormat;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import org.webrtc.Logging;
-
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -148,7 +145,7 @@ public class CameraEnumerationAndroid {
     try {
       Camera.getCameraInfo(index, info);
     } catch (Exception e) {
-      Logging.e(TAG, "getCameraInfo failed on index " + index,e);
+      Log.e(TAG, "getCameraInfo failed on index " + index,e);
       return null;
     }
 
@@ -180,7 +177,7 @@ public class CameraEnumerationAndroid {
       json_format.put("framerate", (format.maxFramerate + 999) / 1000);
       json_formats.put(json_format);
     }
-    Logging.d(TAG, "Supported formats for camera " + id + ": "
+    Log.d(TAG, "Supported formats for camera " + id + ": "
         +  json_formats.toString(2));
     return json_formats.toString();
   }
@@ -199,7 +196,7 @@ public class CameraEnumerationAndroid {
   public static int[] getFramerateRange(Camera.Parameters parameters, final int framerate) {
     List<int[]> listFpsRange = parameters.getSupportedPreviewFpsRange();
     if (listFpsRange.isEmpty()) {
-      Logging.w(TAG, "No supported preview fps range");
+      Log.w(TAG, "No supported preview fps range");
       return new int[]{0, 0};
     }
     return Collections.min(listFpsRange,
@@ -230,7 +227,7 @@ public class CameraEnumerationAndroid {
           return getDeviceName(i);
         }
       } catch (Exception e) {
-        Logging.e(TAG, "getCameraInfo() failed on index " + i, e);
+        Log.e(TAG, "getCameraInfo() failed on index " + i, e);
       }
     }
     return null;