Merge branch 'albertvaka/trusted-networks'

Authored by albertvaka on Jan 5 2020, 9:39 PM.

Description

Merge branch 'albertvaka/trusted-networks'

  1. Conflicts:
  2. AndroidManifest.xml

Details

Committed
albertvakaJan 5 2020, 9:39 PM
Parents
R225:e37aa08dac65: Release 1.13.6
R225:235e49c80f66: Fixes as per code review
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
235e49c80f66albertvaka
Fixes as per code review 
Jan 5 2020
1448814ed7f5albertvaka
Ask for permission, add to settings and notify in main activity 
Oct 27 2019
7f8f1bee30c3D13505Juan David Vega/albertvaka
T8539 - Create a new flow to manage trusted networks 
Oct 27 2019