system anti
Merge branch 'master' of https://github.com/Blak-KANG/android_frameworks_base

Conflicts:
	core/java/android/provider/Settings.java