typo
Merge branch 'master' into android-1.5
a rollback: my git does not know about --no-edit option
Merge branch 'master' into android-1.5