| commit | e0cb56b02eb2bb52a537b32c5d3f5360b9718c8a | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Mon Nov 17 21:02:08 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 17 21:02:10 2014 +0000 |
| tree | 30c3b2875a89fad5847500e781051c9887068bee | |
| parent | 94d963381d7bd75e60da1c3038c7970e47d2ac35 [diff] | |
| parent | bc19c181c8c058c824e4fee907a05129e142c388 [diff] |
Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev