tree 0ae9409a4944f2e1d948aade12597eefacf445ff
parent 60b4a8bc56660409ce525cc856353cf1c5ec78ca
parent c43b02f2cb92ab8d30233909875d5060ea9de89e
author Mark Salyzyn <salyzyn@google.com> 1479403544 +0000
committer android-build-merger <android-build-merger@google.com> 1479403544 +0000

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

Change-Id: Idea08d579dd3d1bfbd98d6cbe2e67781e731db3a