tree 6039fe004da5395c68d7dcc908a818b1d9aaaf1f
parent 89be247ebddfae10b98a7335a26b39fdb2017c09
parent 75fc414b6153108aa173a25f630945f1f7fbc4ea
author Dimitry Ivanov <dimitry@google.com> 1490397039 +0000
committer android-build-merger <android-build-merger@google.com> 1490397039 +0000

Merge "Disable compat_elf_hash_and_relocation_tables test for x86" am: fe96db819b am: 72aed61800
am: 75fc414b61

Change-Id: I8215d3ce5dafc49d6b5df9f3d7f1c48dfdef45c5