am 2aee3fd8: (-s ours) am 85074538: am 8cd62808: Merge "Use delete[] to de-allocate pointers from new[]"

* commit '2aee3fd843138b22f34dc7249c2a2c13a4a49550':