a

Conflicts:

	res/values/cm_strings.xml
Camera: Powerkey shutter (2/2)

Ported from cm-10.1

Including cm-10.1 camera commit:
aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b Don't mess around with pref local ID for power shutter initialization.

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b

Conflicts:

	res/xml/video_preferences.xml
	src/com/android/camera/VideoMenu.java
	src/com/android/camera/VideoModule.java