tree 4fc2bc62c9aefa90d99301def546400f48d19e7f
parent f01c2c66f254ea54f52ab8cb02ba2de0c644c46d
parent 76b103fae2654f00db6b96d8a9b6aa5ac78ff304
author Elliott Hughes <enh@google.com> 1490829744 +0000
committer android-build-merger <android-build-merger@google.com> 1490829744 +0000

Merge "Fix x86 system calls made from ELF preinit." am: 12a07044db am: 5b35e2b9c2
am: 76b103fae2

Change-Id: Id7d8433d8425fe824dc32098dd60ab1ca2c92a4e