tree 3426e9c53fe7c85348b0b5f7e8f0a8bb28dca64b
parent aef587392829756f2fa0c03b44a23e57083618f7
parent 041b0bce8972cd850e2dac347404854b4d7aaec7
author Elliott Hughes <enh@google.com> 1470958822 +0000
committer android-build-merger <android-build-merger@google.com> 1470958822 +0000

Merge "dlerror returns char*, not const char*." am: 166f875eab am: 2ce52afba4
am: 041b0bce89

Change-Id: Ia3d4a0ee0ead60ff64729b6fdfc1774f2075c42f