Merge "Fix StrictMode javadoc copy/paste error." into gingerbread