updated ChangeLog
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	ChangeLog
Merge branch 'master' into beta

Conflicts:
	ChangeLog
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics