tree 02455cddd5e58c2e85a2c78f1d50bd2c12a8cdb6
parent ac46e8240470eefbfebb852906a1972ee5faf4db
parent 00c8450d2711de57ee45f66cae1050dbca98d1f5
author Lorenzo Colitti <lorenzo@google.com> 1423639973 +0000
committer android-build-merger <android-build-merger@google.com> 1423639973 +0000

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

* commit '00c8450d2711de57ee45f66cae1050dbca98d1f5':
  Make getNetworkInfo() take into account VPN underlying networks.