modified:   src/com/android/settings/.DS_Store
Merge branch 'cm-10.2' of github.com:pottkopp/android_packages_apps_Settings into cm-10.2

Conflicts:
	src/com/android/settings/.DS_Store

	deleted:    .DS_Store
	deleted:    res/.DS_Store
	deleted:    src/.DS_Store
	deleted:    src/com/.DS_Store
	deleted:    src/com/android/.DS_Store