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

* commit '5806ab61257e0166e0487e1b0ee10d4b2454a2f7':