getEncoding(int) was not used in native code
Merge branch 'master' into ice-cream-sandwich
formatting
Merge branch 'master' into ice-cream-sandwich