tree 7425c8277db024e8df06cda451ff57607adc2ed5
parent 1230b4935072b31f0321b071a7e1f9f87fac495b
parent 053eba0bc1c6cebb5ddb323fae28d0f95cfff4b0
author Josh Gao <jmgao@google.com> 1447799526 +0000
committer android-build-merger <android-build-merger@google.com> 1447799526 +0000

Merge changes Ice07f892,Ie1f082a0 am: 74a33fbcef
am: 053eba0bc1

* commit '053eba0bc1c6cebb5ddb323fae28d0f95cfff4b0':
  libcutils: don't build for Windows.
  adb: don't link against libcutils on Windows.