tree e2b7b3c2ff8b6ce519cad166dff78f2f12a9353d
parent ded2e6c7bba793e245a2fd910780397bb0420efc
parent 057e21970bb833ee51e28d32ee5d4c02860d144d
author Dimitry Ivanov <dimitry@google.com> 1504111466 +0000
committer android-build-merger <android-build-merger@google.com> 1504111466 +0000

Merge "Restore dummy libdl.a implementation" am: 352afd0e93 am: 5e094247f0
am: 057e21970b

Change-Id: I9e9112cb73dec349eda94296a4d9cab55490e44a