| commit | 03ca5c9f8393ef79df1df383b9746c22da6341a7 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Mon Aug 27 15:17:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 27 15:17:41 2012 -0700 |
| tree | cc44a992e70dcbf1db2a193eecc3a2bd0dcfc959 | |
| parent | 31b50e628d720ff23f9224070471c26142bed4e0 [diff] | |
| parent | f2e722a5070f12b4ae5d1155d1c07a4f039bf520 [diff] |
am f261d88f: am 116ee10b: Merge "Always-on VPN." into jb-mr1-dev * commit 'f261d88f818df20dfd033746bd3072bd42b705c9': Always-on VPN.