| commit | 3c4f6c2fbb945fe45a3e2ea29c846ba1581e6f3f | [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 | 579c5cd0fce2c89c7f203b955c0d56b0beccb493 [diff] | |
| parent | 28707dd663af8772c3069b6b66b13b2d07b3f3c0 [diff] |
am 28707dd6: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b automerge: 00c8450 * commit '28707dd663af8772c3069b6b66b13b2d07b3f3c0': Make getNetworkInfo() take into account VPN underlying networks.