tree 7eb50f1740b05726d114eb0d18ccf5f47b075a1e
parent 4e37d97d6173b87a35c1635b1f6ba47c2d2314cf
parent df519a87fb418e737615060247bc0a78193f5b43
author Josh Gao <jmgao@google.com> 1479164593 +0000
committer android-build-merger <android-build-merger@google.com> 1479164593 +0000

adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a  -s ours am: 5c81df2726 am: f55e22a7d3
am: df519a87fb

Change-Id: I373b7a84b76a1e08914cedc80f26a23496b38551