(2/2) FrameworksBase: Adblocker

 Changes to be committed:
	modified:   core/java/android/provider/Settings.java

Change-Id: I11206d61ba45363c97f31223d08abbbfebc9c29f

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