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

diff --cc src/com/android/camera/one/v2/ImageCaptureManager.java
index 00f1b12,86f58b7..f29c801
--- 1/src/com/android/camera/one/v2/ImageCaptureManager.java
--- 2/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.

diff --cc src/com/android/camera/one/v2/OneCameraZslImpl.java
Simple merge