d
d
d
d
Merge branch 'Wifi_Animation' of https://github.com/ruucm/remodel-mario into Wifi_Animation

Conflicts:
	Mario/bin/Mario.apk
	Mario/bin/classes.dex
	Mario/bin/dexedLibs/facebooksdk-dbb553df8992fcd6cbe6123c0f9fb4a1.jar
	Mario/bin/resources.ap_
d
d
d
Merge branch 'Wifi_Animation' of https://github.com/ruucm/remodel-mario into Wifi_Animation

Conflicts:
	Mario/bin/Mario.apk
	Mario/bin/classes.dex
	Mario/bin/classes/com/exam/WifiAnimation.class
	Mario/bin/classes/com/exam/view/CoinBlockView$UpdateThread.class
	Mario/bin/classes/com/exam/view/InitState$1.class
	Mario/bin/classes/com/exam/view/InitState$InitClickAnim.class
	Mario/bin/classes/com/exam/view/InitState$InitDblClickAnim.class
	Mario/bin/classes/com/exam/view/InitState$InitOftenAnim.class
	Mario/bin/classes/com/exam/view/InitState$InitWaitState$1.class
	Mario/bin/classes/com/exam/view/InitState$InitWaitState$2.class
	Mario/bin/classes/com/exam/view/InitState$InitWaitState$3.class
	Mario/bin/classes/com/exam/view/InitState$InitWaitState$4.class
	Mario/bin/classes/com/exam/view/InitState$InitWaitState.class
	Mario/bin/classes/com/exam/view/InitState$initAnimation.class
	Mario/bin/classes/com/exam/view/InitState.class
	Mario/bin/classes/com/exam/view/Lv0_1State$2.class
	Mario/bin/classes/com/exam/view/Lv0_1State$Lv0ClickAnim.class
	Mario/bin/classes/com/exam/view/Lv0_1State$Lv0DblClickAnim.class
	Mario/bin/classes/com/exam/view/Lv0_1State$Lv0OftenAnim.class
	Mario/bin/classes/com/exam/view/Lv0_1State$Lv0WaitState$3.class
	Mario/bin/classes/com/exam/view/Lv0_1State$Lv0WaitState.class
	Mario/bin/classes/com/exam/view/Lv0_1State.class
	Mario/bin/classes/com/exam/view/Lv0_2State$2.class
	Mario/bin/classes/com/exam/view/Lv0_2State$Lv0_2DblClickAnim.class
	Mario/bin/classes/com/exam/view/Lv0_2State$Lv0_2WaitState$3.class
	Mario/bin/classes/com/exam/view/Lv1State$2.class
	Mario/bin/classes/com/exam/view/Lv1State$Lv1DblClickAnim.class
	Mario/bin/classes/com/exam/view/Lv1State$Lv1WaitState$3.class
	Mario/bin/dexedLibs/android-support-v4-4bd6a2d17aed55571b770fff2d9bce10.jar
	Mario/bin/dexedLibs/android-support-v4-6103d7fe3781c111f3179e473d01b2f8.jar
	Mario/bin/dexedLibs/android-support-v4-7b742c39b62fba58c140850033839d25.jar
	Mario/bin/dexedLibs/android-support-v4-b344c34c3d2af5ede5c71fc705bd1ee2.jar
	Mario/bin/dexedLibs/bolts-08d8adaddfdc548ace32f97c68a5e473.jar
	Mario/bin/dexedLibs/bolts-187e0c981e8087a7c050813c0d2557da.jar
	Mario/bin/dexedLibs/bolts-36fb949b368c34278e1ea7c81cd16e6e.jar
	Mario/bin/dexedLibs/bolts-598e0d94db1cca76f9ecc763aa506fb2.jar
	Mario/bin/dexedLibs/facebooksdk-0c9aa316b47edf2ecda1b64bd8a54893.jar
	Mario/bin/dexedLibs/facebooksdk-abdec5b664cc57e2bd10a276ec695f4b.jar
	Mario/bin/dexedLibs/facebooksdk-acc600af71dd2b7b5edab5d731d0d900.jar
	Mario/bin/dexedLibs/facebooksdk-dbb553df8992fcd6cbe6123c0f9fb4a1.jar
	Mario/bin/resources.ap_
	Mario/project.properties
	Mario/src/com/exam/WifiAnimation.java
	Mario/src/com/exam/view/InitState.java