diff options
| author | Jeff Davidson <jpd@google.com> | 2014-11-17 22:58:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 22:58:05 +0000 |
| commit | e6bc5adf2d4639b63001a5889ad301bae47bcd7f (patch) | |
| tree | 29a2e40ef9964034a0b9e5c4618ccec7c58aadf8 /docs/html/sdk/api_diff | |
| parent | df944b30c2b2c69d7335b8a52959c05ed84e6fb1 (diff) | |
| parent | e0cb56b02eb2bb52a537b32c5d3f5360b9718c8a (diff) | |
am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev
* commit 'e0cb56b02eb2bb52a537b32c5d3f5360b9718c8a':
Enforce VPN control "permission" with an actual permission.
Diffstat (limited to 'docs/html/sdk/api_diff')
0 files changed, 0 insertions, 0 deletions