| commit | f75f77f6ff6ba8c8c7bea83440100fbc90589bb1 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Tue Apr 03 14:26:39 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 03 14:26:39 2018 -0700 |
| tree | 5a526086f65db20f5fef897df94449e746e1049b | |
| parent | 210fb3856c8b83ee9cc3ba3117837a89e1a7a640 [diff] | |
| parent | b1da33969520ada933c297e0524a5c66a7587b27 [diff] |
Merge "Support bypassing TLS in the framework" am: aef9956de2 am: b1da339695 Change-Id: I0994b53d24ed25a2eb9e65429c61cf6fa87c7513