| commit | c8241903fb4f08661bcd97e4a56a9157851513f9 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Fri Jun 05 10:01:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 05 10:01:29 2015 +0000 |
| tree | 7236fe83614b16945893d660d144a9d7825da844 | |
| parent | fecd6d53e12bb06769f26462ef3ab0404b43e6cc [diff] | |
| parent | dd22027732ff253f10db2d0c7510cff299708008 [diff] |
am dd220277: Merge "Prevent VPN being preloaded and activated without user\'s awareness" into lmp-mr1-dev * commit 'dd22027732ff253f10db2d0c7510cff299708008': Prevent VPN being preloaded and activated without user's awareness