am e065bce5: (-s ours) am e188b658: Fix NPE when exiting DcDefaultState. DO NOT MERGE.
Wink Saville [Mon, 7 Oct 2013 00:10:54 +0000 (17:10 -0700)]
* commit 'e065bce5478efc479d37466fd8923e0e2422ec5d':
  Fix NPE when exiting DcDefaultState. DO NOT MERGE.


Trivial merge