| commit | ae41e69d676390d08275e4a6d81b9f8ae4caf828 | [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 | 1b59abaaaa49cf93629186baa9b4e89f8f999c4b | |
| parent | e8ee3a9635354ac70d1a3bed0ac902aa8feac704 [diff] | |
| parent | f12b9edf2413ba30c3cb9de455aa2dde6a5882f0 [diff] |
Merge "Support bypassing TLS in the framework" am: aef9956de2 am: f12b9edf24 Change-Id: I0994b53d24ed25a2eb9e65429c61cf6fa87c7513