Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus
# Conflicts: # .idea/modules/AndroidClearChroma/PhoneProfilesPlus.AndroidClearChroma.iml # .idea/modules/RootShell/PhoneProfilesPlus.RootShell.iml # .idea/modules/RootTools/PhoneProfilesPlus.RootTools.iml # .idea/modules/ToastCompat/PhoneProfilesPlus.ToastCompat.iml # .idea/modules/android-betterpickers/PhoneProfilesPlus.android-betterpickers.iml # .idea/modules/common/PhoneProfilesPlus.common.iml # .idea/modules/noobcameraflash/PhoneProfilesPlus.noobcameraflash.iml # .idea/modules/phoneProfilesPlus/PhoneProfilesPlus.phoneProfilesPlus.iml # .idea/modules/recyclerview-fastscroll/PhoneProfilesPlus.recyclerview-fastscroll.iml # .idea/modules/time-duration-picker/PhoneProfilesPlus.time-duration-picker.iml # build.gradle
- Loading branch information