tree 9e651faeca96ac15b706ff20058d5481ec2e7730
parent eaf3e895fe1aabf34d382e43946c2d51f57a8862
parent bc131ef1bd7be29d2aae7e91fb8a31811e70b07f
author Tao Bao <tbao@google.com> 1507661607 +0000
committer android-build-merger <android-build-merger@google.com> 1507661607 +0000

Merge "otautil: Fix mac build." am: eb8a064066
am: bc131ef1bd

Change-Id: I610fad4289df35d0327ecdd91c271a90f0dd45df