repair bug: changedisplay(armature,i>=0) does not reblind parentbone
Merge pull request #1 from 2youyouo2/develop

merge kaile
Merge pull request #3 from geron-cn/develop

repair bug: changedisplay(armature,i>=0) does not reblind parentbone
[jenkins-watchdog]add the time of single job
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[jenkins-watchdog]add the time of single job
Reverse CONSTRUCTOR_ACCESS to public
Android crash fix on new devices
update android-build.py for copying files about lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket

Conflicts:
	build/android-build.py
[ci skip]auto detect android device ip via adb command
[ci skip]fix typo
performance fixes in QuadCommand
Merge pull request #6102 from ricardoquesada/quadcommand_perf_fixes

performance fixes in QuadCommand
Merge pull request #6100 from heliclei/fix-autotest

Auto detect android device ip via adb command
closed #4584, Add feature to force update the environment variables in setup.py.
Merge branch 'develop' into issue4584
closed #4635: ControlSwitch's marksprite is shown at a wrong place
Fixed #4637: Add loop parameter to Animation::initWithSpriteFrames function