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

Conflicts:
	ChangeLog