commit | ac0bc4ad5f53a659928666fc9accec7bddf173e8 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Wed Feb 11 07:32:53 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 11 07:32:53 2015 +0000 |
tree | f51f3acc57329090d6d49ecea31754b2999f533e | |
parent | 9fa0471a1577ef3008575a01bb84cbc8fad5138f [diff] | |
parent | 489eb043d7685586176198fa0eddc5ea2dc571a9 [diff] |
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.