Squashed commit of "fix gallery show jpg file as video":

commit 23f4f6e139b2f14982e9129f4a8a79ec43f68dd5
Author: Kim Zhang <xiazhang@codeaurora.org>
Date:   Thu Aug 29 17:21:51 2013 +0800

    MediaRecorder: add pause interface

    --add pause in java level
    --add pause in jni level

    Change-Id: I7f2d5d5ebb97716458b55a5780fd6cc3d09e9f11

commit 714df04e8d12ad4f4724a6dfc7120e148aa6b2db
Author: Apurva Rajguru <arajguru@codeaurora.org>
Date:   Fri Dec 14 16:45:03 2012 -0800

    Camera: Add support for QC camera features.

    Added APIs and keys for all QC features. This
    will enable application to get/set paramters.

    Change-Id: I58a53c7b9133a3acddc34b268dac086c9562d533

    Conflicts:
    	core/java/android/hardware/Camera.java
    	core/jni/android_hardware_Camera.cpp

commit 3acb73193045a385ed898e92b7be19916218600b
Author: Jorge Ruesga <jorge@ruesga.com>
Date:   Sat Oct 19 14:12:39 2013 +0200

    QCFace: Fix package path

    Change-Id: I8282331003d0494bd5620cfb6e91f2dcfa708d30
    Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

commit 68a3ebf499218876f4d9198cefdd81567c4b6d6b
Author: Danesh Mondegarian <daneshm90@gmail.com>
Date:   Sun Oct 20 00:34:48 2013 -0700

    DeviceKeyHandler : Allow handling keyevents while screen off

    Some devices require the keyevents to be processed while the screen
    is off, this patchset addresses that by moving the filter up in the call
    hierarchy.

    Change-Id: If71beecc81aa5e453dcd08aba72b7bea5c210590

commit fb49fde470345215e0577a57aea930ec58a0ed2a
Author: Danesh M <daneshm90@gmail.com>
Date:   Fri Oct 18 11:20:47 2013 -0700

    Frameworks : Fix face detection

    I337a7a2e8b124aac76f52abcc0edd8af9b0b0e29 introduced
    the ifdef's at the wrong location. This patchset addresses it.

    Change-Id: I6b19fb96076bdc62b2ca57d1ccaf97f0cb901d67

commit eef880d089bec138333e24c05b71457685b041dc
Author: Thomas Wendt <thoemy@gmx.net>
Date:   Thu Oct 17 19:00:05 2013 +0200

    Fix compilation for non QCOM hardware after 'Enhance face detection' commit

    Change-Id: I337a7a2e8b124aac76f52abcc0edd8af9b0b0e29

commit 809f416f3d37d4c753d0fdbb151bab2d32f1ca32
Author: Emilian Peev <epeevs@codeaurora.org>
Date:   Thu Aug 15 18:40:41 2013 +0300

    Camera: Adds support for longshot configuration

    - The Camera API is extended with one additional
      call for longshot mode configuration.

    Change-Id: If3bcad003facae22ec2bd690480dc3db63f0b28a

    Conflicts:
    	core/jni/android_hardware_Camera.cpp

commit 874eddc27a12f8166023997db42261a145fce1d1
Author: Ivan Evlogiev <ivanevlogiev@codeaurora.org>
Date:   Thu Aug 22 15:28:47 2013 +0300

    Frameworks: QCFace framework added

    Add framework support for extended face detect

    Change-Id: I2a1c477ee6d11f2b9764966abbb85ede9100fe91

commit 436e8b53997a53e6cc25bdc799c74089baebe334
Author: Ashwini Rao <ashwinik@codeaurora.org>
Date:   Thu Feb 16 14:20:56 2012 -0800

    Frameworks: Enhance face detection

    Add support for facial processing features:
    smile detection, gaze detection and blink detection

    Change-Id: Ic186ff0658e755a8b5287cffa1dd58d9eafebc9a

commit 9bd671feaeeb60d439fffed9bdee975b6a066c39
Author: Emilian Peev <epeevs@codeaurora.org>
Date:   Mon Aug 12 16:02:50 2013 +0300

    Camera: Adds support for meta data callbacks

    - This change adds a new type of callback
      that will be called when there are pending
      meta data notifications.

    Change-Id: I84f5cbafe4f023c7b0efa9ec8620756b0eaa428d

    Conflicts:
    	core/java/android/hardware/Camera.java
    	core/jni/android_hardware_Camera.cpp

commit aeeb3a0261a9403b3c44d32d8ccad4d3b55700d3
Author: SanthoshHE <skhara@codeaurora.org>
Date:   Tue Jul 30 12:35:17 2013 +0530

    Camera: Video HDR Feature Integration.

    Added framework support for camera applications to query supported
    video HDR modes and set the required mode.

    Change-Id: Ie318e586838a2f035e59e30fa51af35b52f7c886

    Conflicts:
    	core/java/android/hardware/Camera.java

Change-Id: Iaf99cd4f172c6e3bcd34e75b7eb41e4236bac3ce