diff options
| author | Jef Oliver <jgoliver@jeago.com> | 2012-08-28 11:19:31 -0700 |
|---|---|---|
| committer | Jef Oliver <jgoliver@jeago.com> | 2012-08-28 11:19:31 -0700 |
| commit | 3e8e93a28cf4ab2d13c22c2a6637c8b92f8cf538 (patch) | |
| tree | 40ec1f6941b049cff292cb7653f98936cb070eeb | |
| parent | b9c45f3aca617ddf62af1964cb042bbec2d513c4 (diff) | |
| parent | 12538695a741670c094ca31efab1c275a808ba38 (diff) | |
| download | android_frameworks_base-ics-release.tar.gz android_frameworks_base-ics-release.tar.bz2 android_frameworks_base-ics-release.zip | |
Merge branch 'ics' into ics-releaseics-release
| -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 */ |