Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10bab68d authored by Jef Oliver's avatar Jef Oliver
Browse files

Merge branch 'ics' into cm-9.1.0

parents ad4ef007 12538695

core/java/android/hardware/Camera.java

+0 −6
Original line number Diff line number Diff line
@@ -1849,12 +1849,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