Merge tag 'android-4.2.2_r1' into HEAD
Android 4.2.2 release 1

Conflicts:
	res/values/strings.xml
	res/xml/camera_preferences.xml
	res/xml/video_preferences.xml
	src/com/android/camera/CameraActivity.java
	src/com/android/camera/CameraSettings.java
	src/com/android/camera/PhotoModule.java
	src/com/android/camera/VideoModule.java