tree 4eaf6af86f9633faba1fa4ac12b1ab64c39dbbdd
parent 999bc211ddf5bb9640509dab5731a7e45cb28d5b
parent 027e4e77c26652948f43ac07ca8a738c469d39f0
author Mark Salyzyn <salyzyn@google.com> 1399318725 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399318725 +0000

am 027e4e77: am 74088995: am f2c0f328: Merge "libcutils: win_sdk build issues"

* commit '027e4e77c26652948f43ac07ca8a738c469d39f0':
  libcutils: win_sdk build issues