tree cb3c81822b8cd68ba29d55b8d125371851ae232c
parent f6708a5e70655b12934110139e5d5a222b5f6c46
parent f48efe9bc6b79a7a6c222856a0fb3cbe21d17a6a
author Dimitry Ivanov <dimitry@google.com> 1494785444 +0000
committer android-build-merger <android-build-merger@google.com> 1494785444 +0000

Merge "loader: fix leak of child-to-parent links on dlclose() am: 772db5e6d4 am: 78b10daab3  -s ours am: dfb42b364d am: de4e1ef729 am: 62110f9538 am: cb3e51d006 am: b2792c701f am: 7ac2da9266 am: f62dc07af3 am: ca97abb2fb am: 901c064d4d am: 9d25fbe9fe" into oc-dev-plus-aosp
am: f48efe9bc6

Change-Id: Ic3cf304de62ad89acb5e23fd8c732322a6ce1fd5