tree 8395e43df39bd2edbea07adf5eb9345e9e30f9e8
parent 4abf9e2181afb4702382f58197df87cbd0629ced
parent 82968c371136b8ad2ed8d0c43a9e0911a653e2f6
author dimitry <dimitry@google.com> 1543955342 -0800
committer android-build-merger <android-build-merger@google.com> 1543955342 -0800

Merge "Make __libc_init_malloc weak-for-native-bridge" am: b7cee4ebad
am: 82968c3711

Change-Id: I62c89f74b52d76cadbdabe140cb04b3db40acdca