hu
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test/gen/com/example/test/R.java