am e065bce5: (-s ours) am e188b658: Fix NPE when exiting DcDefaultState. DO NOT MERGE.
authorWink Saville <wink@google.com>
Mon, 7 Oct 2013 00:10:54 +0000 (17:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Oct 2013 00:10:54 +0000 (17:10 -0700)
commit5cae974f106dcd8fe84023afd9c4b1ffb7df3c52
treef901d7966b7259ab3caaee4eeb95967c3521d75d
parent0cdd3c100d5c53bdeae7b474bebbabb10d14b4fc
parente065bce5478efc479d37466fd8923e0e2422ec5d
am e065bce5: (-s ours) am e188b658: Fix NPE when exiting DcDefaultState. DO NOT MERGE.

* commit 'e065bce5478efc479d37466fd8923e0e2422ec5d':
  Fix NPE when exiting DcDefaultState. DO NOT MERGE.