tree 8ac994286fdbba2829f5b184f62ff8a20437e211
parent d0aef3f620e4255a512a33e12ac1be96d0f6fdbe
parent 4c79385c891f2c0b523fbca0d1eef1fc9802c23b
author Dimitry Ivanov <dimitry@google.com> 1494974028 +0000
committer android-build-merger <android-build-merger@google.com> 1494974028 +0000

Merge "linker: remove link from external library on unload am: b37d10cc80 am: 3a644889b2 am: cb40eec87c am: 0399816edb am: 85efd3b591 am: 5ef13ba0ca" into oc-dev-plus-aosp
am: 4c79385c89

Change-Id: I994dbb3d34b6660bfb17911d2a746dced4b0b8c3