tree 65f33edad5871413e4c6aba9dd129de96cf9ae77
parent d2fb4ed58997afd18bd2b5274bf1835644d454fb
parent 3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd
author Doug Zongker <dougz@google.com> 1400252604 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400252604 +0000

am 3ca99f6c: Merge "fix vulnerability in bspatch"

* commit '3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd':
  fix vulnerability in bspatch