Merges, and stuff

This commit is contained in:
d8ahazard
2016-09-17 23:30:46 -05:00
3 changed files with 23 additions and 26 deletions

3
.gitignore vendored
View File

@@ -2,4 +2,5 @@
.gradle
/local.properties
.idea/
/build
/build
app/src/main/java/com/topjohnwu/magisk/RootFragment.java