demo
Update MainActivity.java
Merge branch 'master' of
https://github.com/totozhang/SerialNumScanner.git

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