tree cca14ed16ecc46008f8c3272c379fdaa3eaeba9d
parent 908fadb800849bb9b0c578d4aca135ce9046f5ca
parent 3bbb64943b5c815d6b22b56f3255d6651294adbe
author Jouni Malinen <jouni@qca.qualcomm.com> 1412715108 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412715108 +0000

am 3bbb6494: am 772e12cf: Cumulative security CVE-2014-3686 patch

* commit '3bbb64943b5c815d6b22b56f3255d6651294adbe':
  Cumulative security CVE-2014-3686 patch