tree fbcec986e7cc0918c06f6a7bc435e488142226b0
parent 218faa30d547e549c1efbf9bacf23cc56c8bf481
parent 86b121523d7d3634bf5ac07b6e238b36b3e75f0a
author Brad Fitzpatrick <bradfitz@android.com> 1273509835 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273509835 -0700

am 86b12152: fix windows SDK build

Merge commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a' into froyo-plus-aosp

* commit '86b121523d7d3634bf5ac07b6e238b36b3e75f0a':
  fix windows SDK build