回転禁止
test
Merge branch 'master' of
https://KentaTakahashi@github.com/KentaTakahashi/test.git

Conflicts:
	ImageViewer/bin/ImageViewer.apk
	ImageViewer/bin/classes.dex
	ImageViewer/bin/classes/com/example/imageviewer/MainActivity.class