Fix merge that left CommCareSetupActivity with two onDestroy methods
Merge pull request #6 from dimagi/fix-merge

Fix merge that left CommCareSetupActivity with two onDestroy methods