Fix Progress Action.
show uploading file in play scene
fix potential problem
remove inner function from header file
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
fix build error
Merge pull request #14 from bofeng-song/v3

show uploading file in play scene
Support generate release apk with prebuilt libs.
fixed android degbug
Merge pull request #23 from chuanweizhang2013/v3luaruntime

fixed android degbug
add java nativeIsDebug
Merge pull request #24 from chuanweizhang2013/v3luaruntime

add java nativeIsDebug
[Jenkins][ci skip] Fix the path of android public project
Revert "Merge pull request #6752 from andyque/refactorLayout"

This reverts commit ae118a9d22cd7ec0e2656ef605361467fe0f64cf, reversing
changes made to 6f2f2046c7729b48d69a3c2f54c94fefc4145c8a.
Merge pull request #6833 from andyque/revert_pr

Revert "Merge pull request #6752 from andyque/refactorLayout"
[AUTO][ci skip]: updating cocos2dx_files.json
[AUTO]: updating luabinding automatically
Merge pull request #6834 from lmskater/fix-android-path

[Jenkins][ci skip] Fix the path of android public project
Update the reference of submodule cocos2d-console.
Merge pull request #6835 from CocosRobot/update_cocosfiles_1400568020

[AUTO][ci skip]: updating cocos2dx_files.json