| commit | 30f8707244587b2814d11d79142fbc75abf291f9 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Tue Apr 03 14:17:23 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 03 14:17:23 2018 -0700 |
| tree | 7a71b04a685c8628ea1a131228e3932fd1702fa9 | |
| parent | 828d955393087d50f4cb46f36d1af927feded735 [diff] | |
| parent | 0162dba80d464b3a530da4e187192d22c7619868 [diff] |
Merge "Support bypassing TLS in the framework" am: aef9956de2 Change-Id: I5b8cc38ec136f10a4e61f7edf7a9b4945b80b595