tree 5e221092fc72811b07297d13a0c13f376d68b519
parent db0f5623318298290e9d90714dc519c8854ec30d
parent 985f18ef3ac1d2e6d6aebcf1a819355846e228c2
author Brad Fitzpatrick <bradfitz@android.com> 1283292384 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283292384 -0700

am ae087369: am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread

Merge commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80'

* commit 'ae087369c56a270c33c1c1af5be7d3c5d7f94e80':
  Don't propagate StrictMode over one-way Binder calls.