コミット
Merge remote-tracking branch 'origin/Other' into Other

Conflicts:
	parakeet/src/com/example/parakeet/DownLoadTask.java
	parakeet/src/com/example/parakeet/StatusAdapter.java