tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 8c9ee4e81331e7f347a5f62117c56480faf70737
parent f8c77c28f535435c85d71593bdc64867bc976de9
author Brad Fitzpatrick <bradfitz@android.com> 1276567832 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276567832 -0700

am b5e5b53f: Merge "Add WrappedNetworkSystem to Blockguard for StrictMode work." into gingerbread

Merge commit 'b5e5b53fd0ab8f2cefdf8ec40e36d8e763fb7694' into gingerbread-plus-aosp

* commit 'b5e5b53fd0ab8f2cefdf8ec40e36d8e763fb7694':
  Add WrappedNetworkSystem to Blockguard for StrictMode work.