tree 560b5dcb1a3b1dc694a176dd7fca8e7c63f77414
parent 82a2c8230a604fae03b978630f7c635b79ce9bb7
parent 7ed1f656a623baf7154f6d76ec91aa0213c5f659
author Brad Fitzpatrick <bradfitz@android.com> 1292282845 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1292282845 -0800

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

* commit '0927c9026537166cec36b2f9bb8a764ef8a7c606':
  Fix StrictMode javadoc copy/paste error.