tree 5a526086f65db20f5fef897df94449e746e1049b
parent fcd878365d13cd5a73a61e222005509760f58684
parent 30f8707244587b2814d11d79142fbc75abf291f9
author Erik Kline <ek@google.com> 1522790799 -0700
committer android-build-merger <android-build-merger@google.com> 1522790799 -0700

Merge "Support bypassing TLS in the framework" am: aef9956de2
am: 30f8707244

Change-Id: I0994b53d24ed25a2eb9e65429c61cf6fa87c7513