tree 29bd8bc6b2b39541ffbe735290ad081794c050fd
parent c704ce6c0101f4933587fb2799618fb55e80f69a
parent 3e76fba90aa59e3fea7e72c8722e084a02ea0da0
author Andreas Huber <andih@google.com> 1349124477 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349124477 -0700

am a38e1615: am 6360758c: Make sure we still handle shutdown-related message even if we\'re

* commit 'a38e1615c5963eb59ffdac60cc0bbe5415295818':
  Make sure we still handle shutdown-related message even if we're