tree 13ef2646defd98a0372996f6e98ad50ecdd30a3b
parent f48efe9bc6b79a7a6c222856a0fb3cbe21d17a6a
parent 0b2bb66e1afc9e1099607ed781aa12b382127665
author Android Build Merger (Role) <android-build-merger@google.com> 1494785296 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494785296 +0000

Merge "loader: fix leak of child-to-parent links on dlclose() am: 46c3aa2c0e  -s ours am: 02b94ea8ff am: 623d83754a am: 254aec13d0 am: c65740f4a5 am: 59abd613d4 am: 2514cb784d am: f3537c61bf am: be8327ce71 am: 6be47949d6 am: 4852206c8b am: 24642c2808 am: d21e68a99b" into oc-dev-plus-aosp