tree e07f617e4ccd37dd21b2bc294b1a8346fb8b7831
parent e38e18dafa5861928fda710ed1d92bea8413eda3
parent 31f957bd40b2fd7ce44c5f83be20bc5f39ff9838
author Narayan Kamath <narayan@google.com> 1424870982 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424870982 +0000

am 31f957bd: Merge "Fix buffer overflow security vulnerability (CVE-2014-9495)"

* commit '31f957bd40b2fd7ce44c5f83be20bc5f39ff9838':
  Fix buffer overflow security vulnerability (CVE-2014-9495)