tree 96ee4c002f5d3a9c968dcb5d6baf1de91405b012
parent 8a83ce9cf5487921596161c31714ae1a5e8db6b7
parent 484ebc81263a627b5e24e65373ab0752996ca0c8
author Jon Larimer <jlarimer@google.com> 1439916426 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439916426 +0000

am 484ebc81: am a1e462e5: am 0afecdeb: am aa1cc741: Merge "Check buffer size before using it" into klp-dev

* commit '484ebc81263a627b5e24e65373ab0752996ca0c8':
  Check buffer size before using it