| commit | 13014fc7f8474bc25dd68e94bd9622564603715c | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Thu Jan 08 02:14:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 08 02:14:59 2015 +0000 |
| tree | 6d4664c714f2bef6b583929a8f3011b233198362 | |
| parent | 8ddaa5e861ffbd72ccaa337cfbc95604abcd7d6b [diff] | |
| parent | 77b855a1a832eda78888a2b04e23722c9ca093ab [diff] |
am 77b855a1: Merge "Consider VPN always to be a supported type." into lmp-mr1-dev * commit '77b855a1a832eda78888a2b04e23722c9ca093ab': Consider VPN always to be a supported type.