tree c17fdd91943a5ecb121a42993b5cafb0901e7160
parent 021d8fe0a343d045f7957ae745ee4661652ac160
parent 2754916f01e19f2b539fa200001289a4908db09c
author Tianjie Xu <xunchang@google.com> 1518942939 +0000
committer android-build-merger <android-build-merger@google.com> 1518942939 +0000

Merge "Disable building libapplypatch on mac" am: c1e1d7e711
am: 2754916f01

Change-Id: Ibfb57ca66bb826b2710db4572a2d3d730a7db0e5