tree e3972f09a14a5ce3f1376bc66308ed5fdfbc64a4
parent afbf3d4da4c8014979884fe6a861d749ac05724e
parent d7fc90e60182a56ecc0b9ab724fb53ac161556ee
author Peter Collingbourne <pcc@google.com> 1552111074 -0800
committer android-build-merger <android-build-merger@google.com> 1552111074 -0800

Merge "linker: Handle libraries with disjoint mappings correctly." am: 432db6cfaf
am: d7fc90e601

Change-Id: Ie8aa4f1ec9fca5fddb7124a7fea018f9a394ed05