| commit | 19f47022e0c89a11ef03c158d19fa294168da360 | [log] [tgz] |
|---|---|---|
| author | Sreeram Ramachandran <sreeram@google.com> | Tue Nov 25 15:10:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:10:14 2014 +0000 |
| tree | 0521f0fd58ba3582f0ccb73338bb54bc78d15380 | |
| parent | ca7b07072849fa2e4bf4e074ce1366eb7138befc [diff] | |
| parent | 4096a3107b070339ba06102a32a368f28a31f9a4 [diff] |
am 4096a310: am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev * commit '4096a3107b070339ba06102a32a368f28a31f9a4': Allow VPNs to specify their underlying networks.