Resolve merge conflicts.

# Conflicts:
#   briar-android/src/main/res/values/strings.xml
1 job for 1580-strings-offline-state in 8 minutes and 33 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #3744
test

00:08:33