code cleanup
Merge branch 'master' into android-1.5