upstream
Merge branch 'jb3' of https://github.com/carbon-glacier/android into jb3

Conflicts:
	default.xml