tree 86ce7864cb48f85e5b26307d23554965ccfb14c2
parent 215ebcddf7216d15fde34f9a32d27f280d1b19d3
parent 620f348faf3ce0c39e71338a005f1528765f4d1e
author Marco Nelissen <marcone@google.com> 1403553247 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403553247 +0000

am 620f348f: am da69fdbb: Merge "Fix buffer allocation"

* commit '620f348faf3ce0c39e71338a005f1528765f4d1e':
  Fix buffer allocation