diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-11 12:41:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-11 12:41:11 -0700 |
| commit | ff5c9146b53d8429f8ee778f193582c12da0d2b3 (patch) | |
| tree | ee647683d158da2250f35c6d69761d84a56e25db /core/java/android/hardware | |
| parent | c574fd04cc192fa30af5dd065c5d0cd4c50f8db4 (diff) | |
| parent | 7cfd7d5b65b725d7253295becfe02f03767c71fa (diff) | |
| download | frameworks_base-ff5c9146b53d8429f8ee778f193582c12da0d2b3.zip frameworks_base-ff5c9146b53d8429f8ee778f193582c12da0d2b3.tar.gz frameworks_base-ff5c9146b53d8429f8ee778f193582c12da0d2b3.tar.bz2 | |
Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 7a941b8..08e0ebe 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1811,7 +1811,6 @@ public class Camera { * camera will return an image that has an extended dynamic range * compared to a regular capture. Capturing such an image may take * longer than a regular capture. - * @hide */ public static final String SCENE_MODE_HDR = "hdr"; |