0512141115 - Mergebot : Merge manual pull request from upstream source for device_samsung_smdk4412-common with the following commits:

commit b6f26b5e415112fd5253a3eee52b996fc918380e
Author:     Dheeraj CVR <cvr.dheeraj@gmail.com>
AuthorDate: Sat Jan 11 15:35:45 2014 +0530
Commit:     sbrissen <sbrissen@hotmail.com>
CommitDate: Thu May 1 08:35:39 2014 -0400

    Revert "camera: Fix loss of focus mode between shots"

    This reverts commit 40279ba1fd2d4f02d889699df1eccf3d3a01df55.

    V4L2_CID_CAMERA_FOCUS_MODE has the side effect of resetting the
    sensor AF position. Hence, the focus is lost each time SetParameters
    is called and this happens during a snapshot resulting in out of
    focus pictures.

    Change-Id: Ia644b62e3752196c0637053150af7899155d6a47

commit 7f06e631b725d7324e8cc794db5597a708e76e08
Author:     Andrew Jiang <sam.andrew.jiang@gmail.com>
AuthorDate: Tue Apr 22 20:07:55 2014 +0000
Commit:     Andrew Jiang <sam.andrew.jiang@gmail.com>
CommitDate: Tue Apr 22 20:13:08 2014 +0000

    smdk4412-common: Update recovery_keys

    Cleanup and update, see: http://review.cyanogenmod.org/62724

    Change-Id: Ic7d16dddb56fe7773556572fc0021a00829f6a6c

commit 3de122f91108b3aec9db6eb26141f1ad080c0451
Author:     Ricardo Cerqueira <cyanogenmod@cerqueira.org>
AuthorDate: Thu Apr 17 20:09:14 2014 +0100
Commit:     Ricardo Cerqueira <cyanogenmod@cerqueira.org>
CommitDate: Thu Apr 17 20:10:48 2014 +0100

    media_profiles: Remove unused profiles

    Fixup the table to pass media testing (and get better compatibility
    with 3rd party apps)

    Change-Id: I312ffe1b64043a00a9a89ec6b985e9213fb05c26

commit 9e716cab7c5878bbcd3dabd004a20ad5320f8fee
Author:     markcs <mcampbellsmith@gmail.com>
AuthorDate: Wed Mar 26 22:25:07 2014 +1100
Commit:     markcs <mcampbellsmith@gmail.com>
CommitDate: Wed Mar 26 22:25:07 2014 +1100

    smdk4412: update batteryCurrentNowPath

    Change-Id: I6fe405b67a9b5478cd42014f1892ab8187dbcc0f

commit 0aed9830d0c2e7f3c9d4cdaa77bb89b0d519ff34
Author:     Paul Kocialkowski <contact@paulk.fr>
AuthorDate: Mon Mar 24 12:15:33 2014 +0100
Commit:     Javier Ferrer <javi.f.o@gmail.com>
CommitDate: Mon Mar 24 14:36:10 2014 +0100

    smdk4412-common: camera: Proper recording memory release

    Change-Id: I4cb029f64564a6e5e41b36af6bdb3f35ac1fc464