update sources Gallery2

seems like i missed some changes on last update.
Stoarge options for Camera should be back now & more

Conflicts:
	res/layout/audio_effects_dialog.xml
	res/values-da/cm_strings.xml
	res/values-de/cm_strings.xml
	res/values-el/cm_strings.xml
	res/values-es/cm_strings.xml
	res/values-fr/cm_strings.xml
	res/values-it/cm_strings.xml
	res/values-ja/strings.xml
	res/values-nl/cm_strings.xml
	res/values-pt-rBR/cm_strings.xml
	res/values-ru/cm_strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values/cm_strings.xml
	res/values/strings.xml
	res/xml/camera_preferences.xml
	res/xml/video_preferences.xml
	src/com/android/camera/ActivityBase.java
	src/com/android/camera/CameraSettings.java
	src/com/android/camera/ComboPreferences.java
	src/com/android/camera/MediaSaveService.java
	src/com/android/camera/PanoramaModule.java
	src/com/android/camera/PhotoMenu.java
	src/com/android/camera/PhotoModule.java
	src/com/android/camera/Storage.java
	src/com/android/camera/VideoMenu.java
	src/com/android/camera/VideoModule.java
	src/com/android/gallery3d/app/AbstractGalleryActivity.java
	src/com/android/gallery3d/app/MovieActivity.java
	src/com/android/gallery3d/data/LocalAlbum.java
	src/com/android/gallery3d/util/MediaSetUtils.java

Change-Id: Id087d4337bbf91ad3297d553528537e74ff855f3