| commit | e4fe8091abfdf5fabf82028b2946f7ba6d6f5b64 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Tue Apr 03 19:33:34 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 03 19:33:34 2018 -0700 |
| tree | dc59501ccc79d2a2a028f0bc46256ea4979c84b6 | |
| parent | 2212205a5bbc4c4f49c62d9f3829e7c9612db9d7 [diff] | |
| parent | d161fc5158acc1175557c5fa2331066c8a56698e [diff] |
[automerger skipped] Merge "Support bypassing TLS in the framework" into pi-dev am: 2bad006b0d -s ours Change-Id: I5146ae845469b81dc0aec6838d55be4a33c670ad