tree 3db4a61e3e37901d5449fa76a62825e049f15d6c
parent 8ec9980c735fa66b3a5ce303cb883f2f77d39ef8
parent f50952b0ae7fde883e66289d6629ee625f292df2
author Android Chromium Automerger <chromium-automerger@android> 1385060534 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1385060534 +0000

Merge third_party/openssl from https://chromium.googlesource.com/chromium/deps/openssl.git at f50952b0ae7fde883e66289d6629ee625f292df2

This commit was generated by merge_from_chromium.py.

Change-Id: Ia52da8cb64e7159ee5d35748be202c37c18172b8