fixed bad merge of TabViewActivity.java