summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2017-07-03 15:15:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-03 15:15:21 +0000
commit40be99b8679c9d93a7ded8f2daaf37ce0d464533 (patch)
tree16cc50dd83d15f6a618eaa0607bc07128620b34b
parent1cc9d3a1b85bdd736e284f01e022030e0b782f21 (diff)
parent3a2f341d846add4567f523b109a808e1b2968bff (diff)
downloadapache-http-40be99b8679c9d93a7ded8f2daaf37ce0d464533.tar.gz
Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.android-o-mr1-iot-preview-6o-mr1-iot-preview-6
am: 3a2f341d84 -s ours Change-Id: I6b11c4ae2aae772dc90a3ae98aa03104f5214672
0 files changed, 0 insertions, 0 deletions