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

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