tree ee6ef306daef7409d39526dd9090beb60cbd32ee
parent 7c1139f8e50860ecae7e0c22dae4e73ac57008b2
parent 99861335b28838d844dc8864b5bd1ea48a035c2a
author Elliott Hughes <enh@google.com> 1461959269 +0000
committer android-build-merger <android-build-merger@google.com> 1461959269 +0000

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

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

Change-Id: Icba0704b488adef6c54c68c6abcd5feca30e0d11