summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2013-08-21 19:01:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-21 19:01:11 +0000
commit6b223c6a5be788ca28d5d911ab10650be673684b (patch)
treefa9be2a37e11aa9bdddedb0402b9e5dc28a1b092
parent5b8efc47e95f8b6252f6d879b682c33eceb12500 (diff)
parented255a09ec7260a587e2007b92599a67add4ae10 (diff)
downloadframeworks_base-6b223c6a5be788ca28d5d911ab10650be673684b.zip
frameworks_base-6b223c6a5be788ca28d5d911ab10650be673684b.tar.gz
frameworks_base-6b223c6a5be788ca28d5d911ab10650be673684b.tar.bz2
Merge "Camera2: cleanup unused imports" into klp-dev
-rw-r--r--core/java/android/hardware/camera2/CameraMetadata.java2
-rw-r--r--core/java/android/hardware/camera2/CameraProperties.java4
2 files changed, 0 insertions, 6 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java
index 10ca9be..70d777f 100644
--- a/core/java/android/hardware/camera2/CameraMetadata.java
+++ b/core/java/android/hardware/camera2/CameraMetadata.java
@@ -29,8 +29,6 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
import java.util.Map;
/**
diff --git a/core/java/android/hardware/camera2/CameraProperties.java b/core/java/android/hardware/camera2/CameraProperties.java
index 0c39705..ebbdd88 100644
--- a/core/java/android/hardware/camera2/CameraProperties.java
+++ b/core/java/android/hardware/camera2/CameraProperties.java
@@ -16,10 +16,6 @@
package android.hardware.camera2;
-import android.graphics.Rect;
-
-import java.util.List;
-
/**
* <p>The properties describing a
* {@link CameraDevice CameraDevice}.</p>