| commit | ef22b010952fe4cf9bf60d99e7dcdde8271da0d0 | [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 | 78fd96e934d3555a0a58ce8d390a2176ae4de360 [diff] | |
| parent | 9a30db497cc0f64a3a23b363ec75b582ca8e2465 [diff] |
[automerger skipped] Merge "Support bypassing TLS in the framework" into pi-dev am: 2bad006b0d -s ours Change-Id: I5146ae845469b81dc0aec6838d55be4a33c670ad