tree 6c578727b196ab8eb559ee3920626320d40ea479
parent c03f3c718614b1188e05dde8806964582fd55abf
parent 01f8f8c586717cc8c8b6182f784ae8557c094ad5
author Mark Salyzyn <salyzyn@google.com> 1479402010 +0000
committer android-build-merger <android-build-merger@google.com> 1479402010 +0000

Merge "libcutils:  sdk(mac) build error (part deux)" am: ed0a48c617 am: 5a411029de
am: 01f8f8c586

Change-Id: Ic41cc11458f9ae17815a9c35f57fd2d25c368e78