add update
Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime
fixed xiaomi show ip error
amend comment
Merge pull request #25 from cocos2d/develop

update cocos2d-x
Merge pull request #6313 from chuanweizhang2013/luaruntime

update android runtime