tree 25047f9b9645f6865ea05860398d27169a7b3486
parent e99d8947c09731d71db7e95a280cf81f51f4049a
parent 76c942c1645445a7b3f8b951db70f02cee270326
author Dan Albert <danalbert@google.com> 1407461969 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407461969 +0000

am 76c942c1: Merge "Fix Windows SDK build."

* commit '76c942c1645445a7b3f8b951db70f02cee270326':
  Fix Windows SDK build.