android-7.0.0_r1 - platform/external/conscrypt

tag: be3cc32e414724b703335cf8451c789961778286
tagger: The Android Open Source Project <initial-contribution@android.com>
Mon Aug 22 09:29:32 2016 -0700
object: de4ef934baa87d3d684e701952e2d77cf05b28c6

Android 7.0.0 release 1

commit: de4ef934baa87d3d684e701952e2d77cf05b28c6
[log]
author: The Android Automerger <android-build@google.com>
Sun Jun 19 00:03:33 2016 -0700
committer: The Android Automerger <android-build@google.com>
Sun Jun 19 00:03:33 2016 -0700
tree: 83c146037c4370ec6bbe93b94a86befe5bd466cf
parent: ce5bdd0391d93d9a4b1fe7005041271341eb69b2 [diff]
parent: 563187831ed08bfb052a58e0309f8a539471756c [diff]

merge in nyc-release history after reset to nyc-dev

tree: 83c146037c4370ec6bbe93b94a86befe5bd466cf