tree 6a48fa80d4076aa2f48588982779235e66c59f2f
parent 6aa0ae71a10fa524f0a987a924626cb2e3a7f786
parent 60ce25b34dd3f7c1dadade9ec8769f17b12c39a6
author Christopher Tate <ctate@google.com> 1314143091 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314143091 -0700

am 60ce25b3: Merge "Warn only if we\'re tearing down "live" DeathRecipient content"

* commit '60ce25b34dd3f7c1dadade9ec8769f17b12c39a6':
  Warn only if we're tearing down "live" DeathRecipient content