diff options
| author | Narayan Kamath <narayan@google.com> | 2016-01-08 09:44:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-08 09:44:34 +0000 |
| commit | 7e308606f605dd1bd047e20e17ee53122a64b8ba (patch) | |
| tree | a8e09ab6e02e72a95815ef5ed268117269afb51c /core/java/android | |
| parent | cd51388e01fdecd516218c7a9597618b10781843 (diff) | |
| parent | a909dad0c36542ffbc155f98b4eb054921b1bbd0 (diff) | |
Merge "Trivial correction of Camera2 API description"
am: a909dad0c3
* commit 'a909dad0c36542ffbc155f98b4eb054921b1bbd0':
Trivial correction of Camera2 API description
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraDevice.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index 8f45f72de6e2..852a4d9fd015 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -168,7 +168,7 @@ public abstract class CameraDevice implements AutoCloseable { * <p>The active capture session determines the set of potential output Surfaces for * the camera device for each capture request. A given request may use all * or only some of the outputs. Once the CameraCaptureSession is created, requests can be - * can be submitted with {@link CameraCaptureSession#capture capture}, + * submitted with {@link CameraCaptureSession#capture capture}, * {@link CameraCaptureSession#captureBurst captureBurst}, * {@link CameraCaptureSession#setRepeatingRequest setRepeatingRequest}, or * {@link CameraCaptureSession#setRepeatingBurst setRepeatingBurst}.</p> |