From: Puneet Lall <puneetl@google.com>
Date: Fri, 5 Sep 2014 23:00:07 +0000 (+0000)
Subject: Merge "Implemented rotation of zsl images" into ub-camera-haleakala
X-Git-Tag: android-x86-6.0-r3~689
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d686e6d6fd331d617ff7ec8a09572797b1cc8081;p=android-x86%2Fpackages-apps-Camera2.git

Merge "Implemented rotation of zsl images" into ub-camera-haleakala
---

d686e6d6fd331d617ff7ec8a09572797b1cc8081
diff --cc src/com/android/camera/one/v2/ImageCaptureManager.java
index 00f1b1215,86f58b7ab..f29c801f9
--- a/src/com/android/camera/one/v2/ImageCaptureManager.java
+++ b/src/com/android/camera/one/v2/ImageCaptureManager.java
@@@ -48,9 -48,9 +48,9 @@@ import java.util.concurrent.atomic.Atom
  
  /**
   * Implements {@link android.media.ImageReader.OnImageAvailableListener} and
 - * {@link android.hardware.camera2.CameraCaptureSession.CaptureListener} to
 + * {@link android.hardware.camera2.CameraCaptureSession.CaptureCallback} to
   * store the results of capture requests (both {@link Image}s and
-  * {@link TotalCaptureResult}s in a ring-buffer from which they may be saved.
+  * {@link TotalCaptureResult}s in a ring-buffer from which they may be saved. 
   * <br>
   * This also manages the lifecycle of {@link Image}s within the application as
   * they are passed in from the lower-level camera2 API.