...
...
Merge branch 'master' of https://github.com/skyuning/androidtest

Conflicts:
	AndroidManifest.xml
	res/layout/activity_picasso.xml
	res/layout/activity_qzone_share.xml
	res/layout/activity_short_link.xml
	res/values/strings.xml
	src/com/example/androidtest/PicassoActivity.java
	src/com/example/androidtest/QzoneShareActivity.java
	src/com/example/androidtest/RadioGroupActivity.java
	src/com/example/androidtest/ShortLinkActivity.java
	src/com/example/androidtest/SoftInputActivity.java