tree be3ec16964d57fe4cb365f18be8e57e2aed77971
parent ccc3b87b45efbe825901ed4fbea5a9d8d9f1d699
parent e7ba35013c31a11790a39aa3ad34244a31e1ee1a
author Maarten Derks <maarten@fairphone.com> 1493051035 +0200
committer Maarten Derks <maarten@fairphone.com> 1493051035 +0200

Merge branch 'master' into 'fix_CHK46'

# Conflicts:
#   app/src/main/java/com/fairphone/checkup/information/wifi/WifiInformation.java