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