Merge conflict

This commit is contained in:
topjohnwu
2016-08-25 06:26:20 +08:00
7 changed files with 94 additions and 5 deletions

View File

@@ -188,4 +188,8 @@ public class MagiskFragment extends Fragment {
}
}
}
public void onRootGranted() {
updateStatus();
}
}