values-iw:fix build error pref_camera_picturesize_entry_320x240 being defined twice by strings.xml
Merge branch 'cm-10.1' of https://github.com/garwedgess/android_packages_apps_LegacyCamera into cm-10.1