no message
Merge branch 'master' of https://github.com/alice2525/Aic_A_TestProject

# By Akira Morikawa
# Via Akira Morikawa
* 'master' of https://github.com/alice2525/Aic_A_TestProject:
  no message

Conflicts:
	src/com/example/aic_a_testproject/MainActivity.java