-

HEAD detached from 166d4dff8
You are currently cherry-picking commit 72e249c3b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   res/values/config.xml
	modified:   res/xml/camera_preferences.xml
	modified:   res/xml/video_preferences.xml
	modified:   src/com/android/camera/CameraSettings.java
	new file:   src/com/android/camera/util/MultiMap.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	both modified:   res/values-af/cm_strings.xml
	both modified:   res/values-am/cm_strings.xml
	both modified:   res/values-ar/cm_strings.xml
	both modified:   res/values-as-rIN/cm_strings.xml
	both modified:   res/values-ast-rES/cm_strings.xml
	both modified:   res/values-az-rAZ/cm_strings.xml
	both modified:   res/values-be/cm_strings.xml
	both modified:   res/values-bg/cm_strings.xml
	both modified:   res/values-bn-rBD/cm_strings.xml
	both modified:   res/values-br-rFR/cm_strings.xml
	both modified:   res/values-ca/cm_strings.xml
	both modified:   res/values-cs/cm_strings.xml
	both modified:   res/values-csb-rPL/cm_strings.xml
	both modified:   res/values-cy/cm_strings.xml
	both modified:   res/values-da/cm_strings.xml
	both modified:   res/values-de/cm_strings.xml
	both modified:   res/values-el/cm_strings.xml
	both modified:   res/values-en-rAU/cm_strings.xml
	both modified:   res/values-en-rGB/cm_strings.xml
	both modified:   res/values-en-rIN/cm_strings.xml
	both modified:   res/values-en-rPT/cm_strings.xml
	both modified:   res/values-eo/cm_strings.xml
	both modified:   res/values-es-rMX/cm_strings.xml
	both modified:   res/values-es-rUS/cm_strings.xml
	both modified:   res/values-es/cm_strings.xml
	both modified:   res/values-et-rEE/cm_strings.xml
	both modified:   res/values-eu-rES/cm_strings.xml
	both modified:   res/values-fa/cm_strings.xml
	both modified:   res/values-fi/cm_strings.xml
	both modified:   res/values-fil-rPH/cm_strings.xml
	both modified:   res/values-fr-rCA/cm_strings.xml
	both modified:   res/values-fr/cm_strings.xml
	both modified:   res/values-frp-rIT/cm_strings.xml
	both modified:   res/values-fy-rNL/cm_strings.xml
	both modified:   res/values-gd-rGB/cm_strings.xml
	both modified:   res/values-gl-rES/cm_strings.xml
	both modified:   res/values-gu-rIN/cm_strings.xml
	both modified:   res/values-hi/cm_strings.xml
	both modified:   res/values-hr/cm_strings.xml
	both modified:   res/values-hu/cm_strings.xml
	both modified:   res/values-hy-rAM/cm_strings.xml
	both modified:   res/values-in/cm_strings.xml
	both modified:   res/values-is-rIS/cm_strings.xml
	both modified:   res/values-it/cm_strings.xml
	both modified:   res/values-iw/cm_strings.xml
	both modified:   res/values-ja/cm_strings.xml
	both modified:   res/values-ka-rGE/cm_strings.xml
	both modified:   res/values-kk-rKZ/cm_strings.xml
	both modified:   res/values-km-rKH/cm_strings.xml
	both modified:   res/values-kn-rIN/cm_strings.xml
	both modified:   res/values-ko/cm_strings.xml
	both modified:   res/values-ku/cm_strings.xml
	both modified:   res/values-ky-rKG/cm_strings.xml
	both modified:   res/values-lb/cm_strings.xml
	both modified:   res/values-lo-rLA/cm_strings.xml
	both modified:   res/values-lt/cm_strings.xml
	both modified:   res/values-lv/cm_strings.xml
	both modified:   res/values-mk-rMK/cm_strings.xml
	both modified:   res/values-ml-rIN/cm_strings.xml
	both modified:   res/values-mn-rMN/cm_strings.xml
	both modified:   res/values-mr-rIN/cm_strings.xml
	both modified:   res/values-ms-rMY/cm_strings.xml
	both modified:   res/values-my-rMM/cm_strings.xml
	both modified:   res/values-nb/cm_strings.xml
	both modified:   res/values-ne-rNP/cm_strings.xml
	both modified:   res/values-nl/cm_strings.xml
	both modified:   res/values-oc-rFR/cm_strings.xml
	both modified:   res/values-or-rIN/cm_strings.xml
	both modified:   res/values-pa-rIN/cm_strings.xml
	both modified:   res/values-pl/cm_strings.xml
	both modified:   res/values-pt-rBR/cm_strings.xml
	both modified:   res/values-pt-rPT/cm_strings.xml
	both modified:   res/values-rm/cm_strings.xml
	both modified:   res/values-ro/cm_strings.xml
	both modified:   res/values-ru/cm_strings.xml
	both modified:   res/values-si-rLK/cm_strings.xml
	both modified:   res/values-sk/cm_strings.xml
	both modified:   res/values-sl/cm_strings.xml
	both modified:   res/values-sq-rAL/cm_strings.xml
	both modified:   res/values-sr/cm_strings.xml
	both modified:   res/values-sv/cm_strings.xml
	both modified:   res/values-sw/cm_strings.xml
	both modified:   res/values-ta-rIN/cm_strings.xml
	both modified:   res/values-te-rIN/cm_strings.xml
	both modified:   res/values-th/cm_strings.xml
	both modified:   res/values-tr/cm_strings.xml
	both modified:   res/values-ug/cm_strings.xml
	both modified:   res/values-uk/cm_strings.xml
	both modified:   res/values-ur-rPK/cm_strings.xml
	both modified:   res/values-uz-rUZ/cm_strings.xml
	both modified:   res/values-vi/cm_strings.xml
	both modified:   res/values-zh-rCN/cm_strings.xml
	both modified:   res/values-zh-rHK/cm_strings.xml
	both modified:   res/values-zh-rTW/cm_strings.xml
	both modified:   res/values-zu/cm_strings.xml
	both modified:   res/values/arrays.xml
	both modified:   res/values/cm_strings.xml
	deleted by us:   res/xml/capture_preferences.xml