diff options
| author | Jef Oliver <jgoliver@jeago.com> | 2012-08-28 11:20:01 -0700 |
|---|---|---|
| committer | Jef Oliver <jgoliver@jeago.com> | 2012-08-28 11:20:01 -0700 |
| commit | 10bab68dadba43f5f33c8666c30ae272c35a178e (patch) | |
| tree | 40ec1f6941b049cff292cb7653f98936cb070eeb | |
| parent | ad4ef00732aeeb682f92fb7f2b6d4e1e133ad866 (diff) | |
| parent | 12538695a741670c094ca31efab1c275a808ba38 (diff) | |
| download | android_frameworks_base-cm-9.1.0.tar.gz android_frameworks_base-cm-9.1.0.tar.bz2 android_frameworks_base-cm-9.1.0.zip | |
Merge branch 'ics' into cm-9.1.0cm-9.1.0
| -rw-r--r-- | core/java/android/hardware/Camera.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 1e8ea4e0be1..0b1dc4478c1 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1850,12 +1850,6 @@ public class Camera { public static final String FLASH_MODE_TORCH = "torch"; /** - * Scene mode is off. (for some QCom) - * @hide - */ - public static final String SCENE_MODE_OFF = "off"; - - /** * Scene mode is off. * @hide */ |