tree 9a56aedca339737164f1e7b02a0eb9cf51460b01
parent fde6ea8d29da5f9c6b321df64c8f0722d1173586
parent 5770dfd1e59bda47e093aabd5fe990d2f3860519
author Jon Dormody <jond@google.com> 1510246689 +0000
committer android-build-merger <android-build-merger@google.com> 1510246689 +0000

Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev am: 459735662f am: 13e959bbec am: d9696eb356
am: 5770dfd1e5

Change-Id: Ide1714d289c756891cbfd63db1eb549d4aa0dfbc