tree b6b073ba09659a6382005401994401fb72f70382
parent 5f421caf157bf54c2cfd2ded128ede466e761d4d
parent 372648a70bbb2778edcdad588c8d133a6c55a033
author Jean-Baptiste Queru <jbq@google.com> 1346080402 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346080402 -0700

am 372648a7: Merge "Fix access to freed memory"

* commit '372648a70bbb2778edcdad588c8d133a6c55a033':
  Fix access to freed memory