2nd
test
Merge branch 'mybranch'

Conflicts:
	src/in/wptrafficanalyzer/speechrecognitiondemo/MainActivity.java
NFC