tree 64ad0f34ce4db83c49d710df57e65f4d10688ae4
parent 96518c7fe363d2c0da388ade79391b6ed8dbb20e
parent eab3fc97c47cf9888f365272d6599f05a653fa75
author Christopher Ferris <cferris@google.com> 1545244756 -0800
committer android-build-merger <android-build-merger@google.com> 1545244756 -0800

Merge "Fix handling of libs with a ro map and a rx map." am: 0ec6aa0f22
am: eab3fc97c4

Change-Id: Ib0490ee023936d95cd4ffc3dad98338b218b61a0