am 2d5b11ab: am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread

* commit '2d5b11aba0fec21e1ce3f358eb0d280b62704899':
  Fix StrictMode javadoc copy/paste error.