OSDN Git Service

am 22818680: am a4854d39: (-s ours) Merge "Mixed delete/delete[]."
authorJean-Baptiste Queru <jbq@google.com>
Mon, 8 Jul 2013 17:58:24 +0000 (10:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jul 2013 17:58:24 +0000 (10:58 -0700)
commit869699cd6e8375cc94115b507f9449efb3a5bc16
tree7189e51c61c69bebab1b8c22feebd44e61789c22
parent693f59a373c7976f53a0941ba7307dbbae72b357
parent228186809a25a870c10ed1c8e77ff9623127d304
am 22818680: am a4854d39: (-s ours) Merge "Mixed delete/delete[]."

* commit '228186809a25a870c10ed1c8e77ff9623127d304':
  Mixed delete/delete[].