tree df00a68804d66d01f0ca7e13e53f13a37405105e
parent da30029d4f21ee8a221ca0b6f6ff024749b1be34
parent 190e9cc65d4f5241e87f370a2db1caf7c1c7df13
author Mark Salyzyn <salyzyn@google.com> 1479400508 +0000
committer android-build-merger <android-build-merger@google.com> 1479400508 +0000

Merge "libcutils: sdk(mac) build error" am: 231d1ac640 am: 7bc8810a4a
am: 190e9cc65d

Change-Id: I701734f8f88593e603ca7539548240ba0760b864