typo
Merge branch 'master' into ice-cream-sandwich
a rollback: my git does not know about --no-edit option
Merge branch 'master' into ice-cream-sandwich