tree d97136775dafcbe882db7caeca6aa5f7f2e86a6b
parent f859b684a6db7d99c752008555dc4f98cb5497df
parent 13752ae25c0f9fb51f6628a8b6e83cb33e5f487a
author Tao Bao <tbao@google.com> 1507662943 +0000
committer android-build-merger <android-build-merger@google.com> 1507662943 +0000

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

Change-Id: I87f095467a1a43bbbaf4b2b23762e3b801311d9c