Skip to content
Commit 2d33b31c authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Make getNetworkInfo() take into account VPN underlying networks." into... 

Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90bb
automerge: 00c8450d

* commit '00c8450d':
  Make getNetworkInfo() take into account VPN underlying networks.
parents ac46e824 00c8450d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment