tree cc36ae6f72768afa39e33032fa2e7a70fec08c79
parent a4712d652de45d973bf719c232a1091b94f3258c
parent baccc49d7cfb2720d375cc12c5a4855ffa94dca6
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579174754 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579174754 +0000

Merge "Restore handling of R_GENERIC_NONE relocations" am: c9bde27fbb am: baccc49d7c

Change-Id: Ia3e01411d2491b58dd75001c23877e623da04d6b