tree 2dd946510f2fa914b01d093fb0c622488e651eac
parent c8124d159210befc9ebddb980db6a826c17a5a5f
parent 231d1ac640c4112c984fdea41a372e74d239d2bb
author Mark Salyzyn <salyzyn@google.com> 1479399574 +0000
committer android-build-merger <android-build-merger@google.com> 1479399574 +0000

Merge "libcutils: sdk(mac) build error"
am: 231d1ac640

Change-Id: Icca67be8194faa296b93e9bfec2a15002ac06147