Commit 7bed0279 authored by Robert Hitt's avatar Robert Hitt
Browse files

Merge branch 'master' into 'material-spec'

# Conflicts:
#   app/src/main/res/layout-land/fragment_notification_dialog.xml
#   app/src/main/res/layout/fragment_notification_dialog.xml
parents 9628597a 3482956e
Pipeline #866 failed with stages
in 16 seconds