| commit | 715b702fc6be1688473b9be0b6aa429e8488ca2e | [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 | bb5ca0d715cee319bc3a90873bd4690eacdf67eb | |
| parent | 14c115dcce3f7f1e88c511c3dbbc1534e649f761 [diff] | |
| parent | 294afb30e2f0ec8af6a4e72d20e731a13c680299 [diff] |
am 294afb30: Merge "Consider VPN always to be a supported type." into lmp-mr1-dev * commit '294afb30e2f0ec8af6a4e72d20e731a13c680299': Consider VPN always to be a supported type.