am 74abae35: (-s ours) Merge commit \'89518902\' into merge-conflict
authorWink Saville <wink@google.com>
Mon, 7 Oct 2013 00:10:53 +0000 (17:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Oct 2013 00:10:53 +0000 (17:10 -0700)
commitcca7f8a4db05ab1d9a757cb48bb64f84b5156876
treef901d7966b7259ab3caaee4eeb95967c3521d75d
parente595a18f15d8073c8657ef7fa3da34986acb1a6d
parent74abae3576f9ae6f8ad96762851d880d3853e553
am 74abae35: (-s ours) Merge commit \'89518902\' into merge-conflict

* commit '74abae3576f9ae6f8ad96762851d880d3853e553':
  Change DcTracker construction so only initialization is preformed. DO NOT MERGE.