getEncoding(int) was not used in native code
Merge branch 'master' into android-1.5
formatting
Merge branch 'master' into android-1.5