commit | 2dd68f13244285b9bae4fc68f183e4d7a73f1152 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Wed Feb 11 07:40:08 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 11 07:40:08 2015 +0000 |
tree | d38ecd54353ae283d8117a3282e3044f2f5d51c4 | |
parent | c901766a3746e775d82da72260d6fe87008b718c [diff] | |
parent | ac0bc4ad5f53a659928666fc9accec7bddf173e8 [diff] |
am ac0bc4ad: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b automerge: 00c8450 * commit 'ac0bc4ad5f53a659928666fc9accec7bddf173e8': Make getNetworkInfo() take into account VPN underlying networks.