deleted:    services/java/com/android/server/location/LocationFudger.java~
	deleted:    test.upload
Merge branch 'cm-11-s2plus' of https://github.com/dimimeim/android_frameworks_base into cm-11-s2plus