| commit | 6f8546b8c3b9d6731bd74ee2b8ae4e6026ec6383 | [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 | fcd878365d13cd5a73a61e222005509760f58684 [diff] | |
| parent | 30f8707244587b2814d11d79142fbc75abf291f9 [diff] |
Merge "Support bypassing TLS in the framework" am: aef9956de2 am: 30f8707244 Change-Id: I0994b53d24ed25a2eb9e65429c61cf6fa87c7513