| commit | 9693de21f4b0ad813628ecebe2129ece22d209b9 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Aug 21 03:02:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 03:02:37 2014 +0000 |
| tree | fdb15597e97ce3f46f413a9e091027ac62231602 | |
| parent | 8c7dfb3a3b5ad2c87494a94dc319a2e6344e536f [diff] | |
| parent | a29bc43b0df7a763bfca98b450bb01c11d7c6d2a [diff] |
am 2e9ab3ab: am aebd7b79: Merge "Update state to failed if the VPN fails to connect." into lmp-dev * commit '2e9ab3abfd1fe84a3021d549cdd43c45c8bfda73': Update state to failed if the VPN fails to connect.