tree ee6ef306daef7409d39526dd9090beb60cbd32ee
parent 111eb3eb19c8ce3301d15dc9bcf972c24754981a
parent 0dc3922511f6be0063bd0f11ac43173f5bb2d4a2
author Elliott Hughes <enh@google.com> 1463083752 +0000
committer android-build-merger <android-build-merger@google.com> 1463083752 +0000

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

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

Change-Id: Ie31a10ceea2b17f2956eb3b86fe2b3045d00f09e