code simplification & optimization
Merge branch 'master' into android-1.5
field name
Merge branch 'master' into android-1.5