tree d12d43078609f2cd76ce6b6c1118a88bcc4e0024
parent bdd209561ee8c2245329720fd317732eb77e7c1b
parent ad551eaa0429bf5085f2901c5d367e8a54b7ed16
author Elliott Hughes <enh@google.com> 1358897033 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358897033 -0800

am ad551eaa: am 5f7b6b83: am 547eba0a: Merge "Avoid overflow in memccpy."

* commit 'ad551eaa0429bf5085f2901c5d367e8a54b7ed16':
  Avoid overflow in memccpy.