Commits
Lorenzo Colitti authored and Android Git Automerger committed 0f0e93dc702M
am e1507ac5: am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b * commit 'e1507ac506a4dac327a5cbabede0384836659de0':
Showing diff to2d33b31c86a