tree 085eea57d3f91ab8e0aae58c4cb9c898794a5131
parent a28402b4310db3ba5ae4ec859d32479b25af9ad4
parent aa8f766bf0ead7d87ed1084880f42aa4b2d01fbb
author Dan Albert <danalbert@google.com> 1501629557 +0000
committer android-build-merger <android-build-merger@google.com> 1501629557 +0000

Merge "Mark new/delete as weak in the NDK stubs."
am: aa8f766bf0

Change-Id: I1033bc0a963dd03476a77c0a54915b9c4353a5aa