OSDN Git Service

am f13f1efa: (-s ours) am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete."
authorDan Albert <danalbert@google.com>
Thu, 27 Aug 2015 10:25:38 +0000 (10:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:25:38 +0000 (10:25 +0000)
* commit 'f13f1efab233b5b90c185b973665e5b675a6de53':


Trivial merge