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)
* commit '228186809a25a870c10ed1c8e77ff9623127d304':
  Mixed delete/delete[].


Trivial merge