tree c75be0e339a6fed84d914455651c89abcf0bf960
parent a2c617ca919680ff1b82a974a7c405f210037a16
parent 822a5c622d4909cf7aeb618856a05829d865d4a9
author Lorenzo Colitti <lorenzo@google.com> 1409781807 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409781807 +0000

am 822a5c62: Merge "Fix DoS vulnerability in DHO_OPTIONSOVERLOADED."

* commit '822a5c622d4909cf7aeb618856a05829d865d4a9':
  Fix DoS vulnerability in DHO_OPTIONSOVERLOADED.