Fliptile animation - Fix derps

Change-Id: I7c22b9f36de9900cb55cd74c57d588b9ad1809cc
Signed-off-by: Anthony <Disciple3603@gmail.com>

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