am 32cfa952: (-s ours) am 099ec31b: am ff201659: Merge "Fix the Mac libcutils build."

* commit '32cfa9527136665689818399771174b5e25d32ba':
This commit is contained in:
Elliott Hughes 2015-08-27 11:40:25 +00:00 committed by Android Git Automerger
commit 9ecbf3b8f9

Diff content is not available