Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge branch 'cm-10.1' of git://github.com/Team-Hydra/android_packages_apps_Camera into cm-10.1
camera: Restart the preview if record size changes

  * Needed to release the buffers on many cameras when the record size
    changes but the preview size does not. Without releasing the buffers,
    we can run out of ION space and end up with a mangled recording.

Change-Id: I3ebee850b3e20b3920368c8e052a428f6dd9e3e5
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge branch 'cm-10.1' of git://github.com/Team-Hydra/android_packages_apps_Camera into cm-10.1