tree 085eea57d3f91ab8e0aae58c4cb9c898794a5131
parent 2c533726fd7a4265e2392afc46245f991ed0812f
parent 0d3a65376aaa146266b59ee174bf5fa880b8643e
author Dan Albert <danalbert@google.com> 1501630220 +0000
committer android-build-merger <android-build-merger@google.com> 1501630220 +0000

Merge "Mark new/delete as weak in the NDK stubs." am: aa8f766bf0 am: f781e14912 am: 8d65c300c2
am: 0d3a65376a

Change-Id: I6052c382986deb1e106c210a28378df15d753031