안드로이드 빌드

안드로이드 빌드
Merge branch 'master' of https://github.com/gedog31/ProjectA

Conflicts:
	ProjectA/proj.android/assets/MainUI/fail.png
	ProjectA/proj.android/assets/MainUI/icon_cancel.png
	ProjectA/proj.android/assets/icon/icon_store.png
	ProjectA/proj.android/libs/armeabi/libcocos2dcpp.so

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/AppDelegate.o

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/AppDelegate.o.d

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/GameData/GameDataManager.o

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/GameData/GameDataManager.o.d

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/GameData/Item/ItemData.o

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/GameData/Item/ItemData.o.d

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/GameData/UserData/UserInfoData.o

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/GameData/UserData/UserInfoData.o.d

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/GameMain/GameManager.o

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/GameMain/GameManager.o.d

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/Network/NetworkManager.o

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/Network/NetworkManager.o.d

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/UI/GameMainScene/GameMainScene.o

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/UI/GameMainScene/GameMainScene.o.d

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/UI/IntroScene/IntroScene.o

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/UI/IntroScene/IntroScene.o.d

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/UI/UIManager.o

ProjectA/proj.android/obj/local/armeabi/objs/cocos2dcpp_shared/__/__/Cla
sses/UI/UIManager.o.d