tree 40c741f9d1f8e1e24f89ee73341a71954d866019
parent 449236cbedca7c708c58eea83d19fe046b09ac84
parent 266099b1e188ca6742cf4b0868370112c40ce22d
author Mathieu Chartier <mathieuc@google.com> 1375319040 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375319040 -0700

am 266099b1: Merge "Fix mismatched malloc / delete."

* commit '266099b1e188ca6742cf4b0868370112c40ce22d':
  Fix mismatched malloc / delete.