OSDN Git Service

Merge "Cope with AT_SYSINFO not being set on x86." am: 3c71e1ae18
authorElliott Hughes <enh@google.com>
Wed, 10 May 2017 01:45:45 +0000 (01:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 May 2017 01:45:45 +0000 (01:45 +0000)
commitdd35722f83afcb2dcdfe6db6e5b880f9619b8f56
tree0041cfe58bcf96384c9a31b717e7593c53f1dae6
parent1902afeb8f51f1a79f4f0a62a3c31f5e9527d354
parent0a27d1b6c0f47ce567ed44205507f5c4cb7dce65
Merge "Cope with AT_SYSINFO not being set on x86." am: 3c71e1ae18
am: 0a27d1b6c0

Change-Id: I09da6e37dc0c916cee9bdd5533a1fd251eaa8197