tree bb6144544024fd49a0c9c2b610eb4924c16540b5
parent 078ccbdbb98c118aa87cab2fef61ff90dd128358
parent c4b204bdc4ab974f1f96814c93d8eaa750c15122
author Brad Fitzpatrick <bradfitz@android.com> 1279233881 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279233881 -0700

am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thread-locals in-sync." into gingerbread

Merge commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122' into gingerbread-plus-aosp

* commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122':
  More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.