Adjust android.mk for cocos2d and related module
Adjust android.mk for cocos2d and related module
Merge branch 'v3-androidmk' of https://github.com/Dhilan007/cocos2d-x into v3_test

Conflicts:
	cocos/Android.mk
	cocos/editor-support/cocosbuilder/Android.mk
	cocos/ui/Android.mk
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_test
remove unneeded includes
remove unneeded includes
fix skew matrix bug
fix TextureAtlas drawNumberofQuads bug
[AUTO][ci skip]: updating cocos2dx_files.json
Update bindings-generator submodule
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_tip
Update bindings-generator submodule
Update bindings-generator submodule
Remove careless modification
Merge pull request #7909 from CocosRobot/update_cocosfiles_1409291025

[AUTO][ci skip]: updating cocos2dx_files.json
remove unneeded includes
fix conflict
revert lua-bindings
fix primitive draw error
Merge pull request #7911 from samuele3hu/v3_tip

Update bindings-generator submodule