tree c08d809877c335b71122fd5b091febb24bc7bd81
parent 9a9fd61e0b4a93ef36b13e4ff00621dd594b96cb
parent 16e5aba9c8157b3ffdcdceda378896a43f074748
author Dan Albert <danalbert@google.com> 1439588596 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439588596 +0000

am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete."

* commit '16e5aba9c8157b3ffdcdceda378896a43f074748':
  Fix mismatched new[]/delete.