01710d7b78
(cherry picked from commit 4a3070265a)
# Conflicts:
# app/proguard-rules.pro
(cherry picked from commit 4a3070265a)
# Conflicts:
# app/proguard-rules.pro