tree c2c8723a8d98091ac2e3479ba6c4b88bb33cd90e
parent 6ebeefa04cb3c360d8028eb77e60bacf8a800cb1
parent 8e115e6460f5bfe5e682dda6e816b9d8c84bc525
author Robert Ly <robertly@google.com> 1407426910 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407426910 +0000

am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs

* commit '8e115e6460f5bfe5e682dda6e816b9d8c84bc525':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).