| commit | f12b9edf2413ba30c3cb9de455aa2dde6a5882f0 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Tue Apr 03 14:17:23 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 03 14:17:23 2018 -0700 |
| tree | b23835cc21c2d68b287172e6e424c3330ef9aa66 | |
| parent | c9740fb3934bc417f6169cec83c2704e692bf55f [diff] | |
| parent | aef9956de295378608306740bdc927e47e09794a [diff] |
Merge "Support bypassing TLS in the framework" am: aef9956de2 Change-Id: I5b8cc38ec136f10a4e61f7edf7a9b4945b80b595