load large image
Merge branch 'master' of https://github.com/shnlg/AndroidTest

Conflicts:
	src/com/example/androidtest/displayImage/LoadLargeImageActivity.java