tree cc6c05102a9661544acbbee9eaa21d10294cef1f
parent 41aa7b9fc3ae452215876143852024720383e102
parent 1dccc9f3e889a5b702ec201129db689ab64a5eb8
author Jean-Baptiste Queru <jbq@google.com> 1346080559 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346080559 -0700

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

* commit '1dccc9f3e889a5b702ec201129db689ab64a5eb8':
  Fix access to freed memory