summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorShuzhen Wang <shuzhenwang@google.com>2018-10-11 14:34:05 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-11 14:34:05 -0700
commitacca5faecf58772354fdeb67f97cb73a4577f5ee (patch)
tree5c8cdb942909a177c08723eccba461e0ce17057a /core/java/android
parentc3f2df9d6b8eb22e5a112420ecfe0b55d8f5d585 (diff)
parent94813407771c2216b91e30e76963dd7621cc9794 (diff)
Merge "Camera: Trivial doc update" am: e9f1e8c123
am: 9481340777 Change-Id: I5d9c7fc848eb154e27012f1101340da2195bc423
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/hardware/camera2/CameraMetadata.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java
index caa99d5cb2a8..12c2149284b5 100644
--- a/core/java/android/hardware/camera2/CameraMetadata.java
+++ b/core/java/android/hardware/camera2/CameraMetadata.java
@@ -2082,7 +2082,7 @@ public abstract class CameraMetadata<TKey> {
/**
* <p>Optimized for dim settings where the main light source
- * is a flame.</p>
+ * is a candle.</p>
* @see CaptureRequest#CONTROL_SCENE_MODE
*/
public static final int CONTROL_SCENE_MODE_CANDLELIGHT = 15;