tree 653b565a6456c6bc28c77296b7401614aaf2fc2e
parent eae2aeb37d0800a18b48aa9c255483cd3d094133
parent 4b1a236d00568699e773268085125bd6397412d2
author Brad Fitzpatrick <bradfitz@android.com> 1285194971 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285194971 -0700

am 9317801a: am c87a8adc: Merge "Flesh out StrictMode docs." into gingerbread

Merge commit '9317801a3c9be6d1a1dbde558ca7d2106982e96f'

* commit '9317801a3c9be6d1a1dbde558ca7d2106982e96f':
  Flesh out StrictMode docs.