tree a3023fa114cd510d3139752cde94cd415ffdafab
parent ba57d1b9a512a56eaaed3b95b8144d0a25f2b01b
parent 7f7fa79c4e373f58439e3bf34278364607dffb05
author Brad Fitzpatrick <bradfitz@android.com> 1279260335 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279260335 -0700

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

Merge commit 'cc52121c4f88e9feb8404937bcbfff6e73084666'

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