| commit | 82f479d0647855148af84fe2ba5484cb188c92cc | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Aug 08 16:22:23 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 08 16:22:23 2012 -0700 |
| tree | db1d276b5151af550ab97b4fe9d2f95bdaf42c9a | |
| parent | f3c16a12aa0408a69ff358843d020f9ff6b883f1 [diff] | |
| parent | 088f29f55eebc6862a4cb5dddeaefacf24f74d95 [diff] |
Merge "Cleaner controls between Vpn and init services." into jb-mr1-dev