添加cordova核心代码
Hello Cordova
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/doomonline/smartapp-android

Conflicts:
	AndroidManifest.xml
	assets/www/cordova.js
	assets/www/index.html
	gen/cn/wxcs/smartapp/BuildConfig.java
	gen/cn/wxcs/smartapp/R.java
	res/xml/config.xml
	src/cn/wxcs/smartapp/MyActivity.java
Merge branch 'master' of https://github.com/doomonline/smartapp-android

Conflicts:
	AndroidManifest.xml
	assets/www/cordova.js
	assets/www/index.html
	gen/cn/wxcs/smartapp/BuildConfig.java
	gen/cn/wxcs/smartapp/R.java
	res/xml/config.xml
	src/cn/wxcs/smartapp/MyActivity.java
Merge remote-tracking branch 'origin/master'