tree ee6ef306daef7409d39526dd9090beb60cbd32ee
parent 7c1139f8e50860ecae7e0c22dae4e73ac57008b2
author Elliott Hughes <enh@google.com> 1461959664 +0000
committer Xin Li <delphij@google.com> 1463078291 +0000

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

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

Change-Id: Ib86acbcc9e496c30887af93698542a051658653e
(cherry picked from commit 21d659ab26e4dbdbdcddd24346ece75451ccfae1)

BUG: 28704419