diff options
| author | Jeff Davidson <jpd@google.com> | 2014-11-25 17:49:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 17:49:39 +0000 |
| commit | 476d5a265bae7c638d83fc59037a885065e344a4 (patch) | |
| tree | 0c07fc0315654b1acdad3467acdac852dcc737c0 /docs/html/sdk/api_diff/20 | |
| parent | 4043fd8fec7e7f507851715138d705a8fdfe9e90 (diff) | |
| parent | 6fdf2a1709c2006275d148e3156d249dcc27a99c (diff) | |
am 6fdf2a17: am 6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev
* commit '6fdf2a1709c2006275d148e3156d249dcc27a99c':
Don't enforce control permission when preparing consented VPN.
Diffstat (limited to 'docs/html/sdk/api_diff/20')
0 files changed, 0 insertions, 0 deletions