tree 395578df03a9a294162667f61768814430ca5558
parent 9cb1d219bdacd4076f8636523a1dbd77ebed2938
parent 5682e001e9da3c24b22bbd1c5686fba538051ed4
author Richard Uhler <ruhler@google.com> 1487935034 +0000
committer android-build-merger <android-build-merger@google.com> 1487935034 +0000

Merge "Revert "Make libutils test compile on the host"" am: 16f4fb9c4e
am: 5682e001e9

Change-Id: I3b01c3f65e7b05191b3867928a5e9d1b8f8cc1c8