cancelactivity
Merge branch 'beta' of github.com:geometer/FBReaderJ into beta
Merge branch 'beta' into beta-ics
common styles for master & ics builds
common styles for master & ics builds
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
merge order
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
Merge branch 'multidirs' into beta

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
Merge branch 'beta' into beta-ics

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern