tree ee6ef306daef7409d39526dd9090beb60cbd32ee
parent 7c1139f8e50860ecae7e0c22dae4e73ac57008b2
parent 111eb3eb19c8ce3301d15dc9bcf972c24754981a
author Elliott Hughes <enh@google.com> 1461959402 +0000
committer android-build-merger <android-build-merger@google.com> 1461959402 +0000

Merge "Android doesn\'t really have <sys/syslimits.h>." am: 282db28ba0 am: 99861335b2
am: 111eb3eb19

* commit '111eb3eb19c8ce3301d15dc9bcf972c24754981a':
  Android doesn't really have <sys/syslimits.h>.

Change-Id: I31b8674b70e392da01a7194d8b83e5f0870a69e1