| commit | 31b50e628d720ff23f9224070471c26142bed4e0 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Fri Aug 24 11:37:58 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 24 11:37:58 2012 -0700 |
| tree | dcfa3c5e40adb1cff5eb196b5a79e2dfa05ddf03 | |
| parent | 5c900a6685d4f99bf5deafab7ea35da51af99ea1 [diff] | |
| parent | c2a8e40c7a5cd012084343b72e7f845689ed99bf [diff] |
am 33f94286: am 34f86312: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev * commit '33f942865c27a0af155ec2be2f1154fe7ece6072': Migrate legacy VPN arguments to system_server.