totyuu
Merge branch 'master' of https://github.com/TechCAMP2013/cyber
ikeeeeee
uwaaa
Merge branch 'master' of https://github.com/TechCAMP2013/cyber

Conflicts:
	bin/classes/ya/example/manga4/DrawActivity.class
	bin/classes/ya/example/manga4/SelectColorActivity.class
画像ポップアップなど
test
Merge branch 'master' of https://github.com/TechCAMP2013/cyber

Conflicts:
	.classpath
	bin/Manga4.apk
	bin/classes.dex
	bin/classes/ya/example/manga4/AsyncHttpPost.class
	bin/classes/ya/example/manga4/Complete4Activity$ImageAdapter.class
	bin/classes/ya/example/manga4/DrawActivity$B_100ClickListener.class
	bin/classes/ya/example/manga4/DrawActivity$B_22ClickListener.class
	bin/classes/ya/example/manga4/DrawActivity$B_2ClickListener.class
	bin/classes/ya/example/manga4/DrawActivity$B_42ClickListener.class
	bin/classes/ya/example/manga4/DrawActivity$B_62ClickListener.class
	bin/classes/ya/example/manga4/DrawActivity$B_82ClickListener.class
	bin/classes/ya/example/manga4/DrawActivity$BrushClickListener.class
	bin/classes/ya/example/manga4/DrawActivity$BtClickListener.class
	bin/classes/ya/example/manga4/DrawActivity$ColorClickListener.class
	bin/classes/ya/example/manga4/DrawActivity$EraserClickListener.class
	bin/classes/ya/example/manga4/DrawActivity$StampClickListener.class
	bin/classes/ya/example/manga4/DrawActivity$TlClickListener.class
	bin/classes/ya/example/manga4/DrawActivity.class
	bin/classes/ya/example/manga4/DrawModeActivity.class
	bin/classes/ya/example/manga4/DrawView.class
	bin/classes/ya/example/manga4/LoginActivity$DecideClickListener.class
	bin/classes/ya/example/manga4/LoginActivity$HowtoClickListener.class
	bin/classes/ya/example/manga4/LoginActivity.class
	bin/classes/ya/example/manga4/MainActivity.class
	bin/classes/ya/example/manga4/MyGalleryActivity$ImageAdapter.class
	bin/classes/ya/example/manga4/R$id.class
	bin/classes/ya/example/manga4/R$layout.class
	bin/classes/ya/example/manga4/R$menu.class
	bin/classes/ya/example/manga4/R$string.class
	bin/classes/ya/example/manga4/R$style.class
	bin/classes/ya/example/manga4/Show4KomaActivity.class
	bin/classes/ya/example/manga4/TopActivity.class
	bin/jarlist.cache
	bin/resources.ap_
	src/ya/example/manga4/AsyncHttpFile.java
	src/ya/example/manga4/DecideTitleActivity.java
	src/ya/example/manga4/DrawModeActivity.java
	src/ya/example/manga4/DrawView.java
	src/ya/example/manga4/LoginActivity.java
adf
なんかできた