android works!!
Merge branch 'newcode' into improved_glprogram
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram