cc52121c4f
Merge commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122' into gingerbread-plus-aosp * commit 'c4b204bdc4ab974f1f96814c93d8eaa750c15122': More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.