tree 1b59abaaaa49cf93629186baa9b4e89f8f999c4b
parent e8ee3a9635354ac70d1a3bed0ac902aa8feac704
parent f12b9edf2413ba30c3cb9de455aa2dde6a5882f0
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: f12b9edf24

Change-Id: I0994b53d24ed25a2eb9e65429c61cf6fa87c7513