| commit | b1d3df3269eae9c1397d5f94d60f621d75c3cb8b | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed Feb 11 07:45:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 11 07:45:49 2015 +0000 |
| tree | 63c59bab3bbb5ce6f60285c2c7004ecd6c8482f8 | |
| parent | 492def919811bfcd7149651c6ea8ee0a2434bf79 [diff] | |
| parent | 0f0e93dc702e97644bacceb7ac08552672a8151d [diff] |
am 0f0e93dc: am e1507ac5: am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev automerge: c38b90b * commit '0f0e93dc702e97644bacceb7ac08552672a8151d':