Missing break in switch statement

Change-Id: I462c0c5fec96a850032266b04419ec409ad02174
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_frameworks_base into CyanogenMod-cm-11.0

Conflicts:
	location/java/android/location/LocationRequest.java

	modified:   core/res/res/values/config.xml
Merge branch 'cm-11.0' of https://github.com/cr3pt/android_frameworks_base into cm-11.0