diff options
| author | Erik Kline <ek@google.com> | 2018-04-03 14:40:56 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-03 14:40:56 -0700 |
| commit | 74f9c1db1496d63b942d010416dd75ede9478a86 (patch) | |
| tree | dc0088a8c950eaea0f679628882e672a8ecf230a /docs/html/sdk/api_diff/12/changes | |
| parent | 540296f526cadc0ba8152f2f6f833d9eda5bd891 (diff) | |
| parent | ae41e69d676390d08275e4a6d81b9f8ae4caf828 (diff) | |
Merge "Support bypassing TLS in the framework" am: aef9956de2 am: f12b9edf24
am: ae41e69d67
Change-Id: I4c49e23d8caa4d485df1c1d2f135a7282d439c0b
Diffstat (limited to 'docs/html/sdk/api_diff/12/changes')
0 files changed, 0 insertions, 0 deletions