beta version => 2.0 beta 12
beta version => 2.0 beta 12
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
version number
Merge branch 'beta' into beta-ics

Conflicts:
	AndroidManifest.xml