Derp from previous commit

Change-Id: Ib6071882134b0430470938d0ea8ccdf1c258b976
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Revert commit - 526888e5a0fc0796b2f3c40b353b2261e2a39d5c
Merge remote-tracking branch 'pa/jb43' into jb43-test
Framework: Generic Blacklist support (4 of 5)

Change-Id: Id6c85c9a537713ec77d00deb7f7fe5a9150be2cd

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