x
Merge branch 'master' of http://www.github.com/wansir/Android

Conflicts:
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi