tree ac0c4048a573c77b88f2304411134e412ac2325a
parent 43e4eddd664dbc39e181a99f457394196d6c3f08
parent 814f05d8532e95523107235245f373e2d8f42b18
author Tao Bao <tbao@google.com> 1507662396 +0000
committer android-build-merger <android-build-merger@google.com> 1507662396 +0000

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

Change-Id: I0fb78094a2ef258ef1d463c9784249fbdae7fff3