diff options
| author | Tony Mak <tonymak@google.com> | 2016-06-03 11:07:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 11:07:41 +0000 |
| commit | 4b63e1d9d31f9df2660efbb9e7bedc4c43fa9ab3 (patch) | |
| tree | 8ba1e089cf269c5a8aee2687186ed71bf57a2b89 /docs/html/sdk/api_diff/20/changes.html | |
| parent | 7cf85ffc58fd403c59a38442d9de09620b38b032 (diff) | |
| parent | 9c13d78862ff07b2f7664d578c6fa5b28c2e6d58 (diff) | |
Merge "OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43 am: d73c6eb6f3" into nyc-mr1-dev-plus-aosp
am: 9c13d78862
* commit '9c13d78862ff07b2f7664d578c6fa5b28c2e6d58':
Change-Id: Ife7cda0e14804f8974a5142e423b7b85bade196e
Diffstat (limited to 'docs/html/sdk/api_diff/20/changes.html')
0 files changed, 0 insertions, 0 deletions