div
Merge branch 'jon'

Conflicts:
	Ambiguous/gen/no/hiof/android/ambiguous/R.java

Merge test
merge test
Merge branch 'jon'