tree 19bdece6fafbcb6375068d3ce18110188a9a1db4
parent 91b3748f3c0a6891d6120a99e8fef5025f4d5706
parent 3130a32fd910f424a9d6b811ed23d9a552004c81
author Nick Kralevich <nnk@google.com> 1361594445 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361594445 -0800

am 3130a32f: Merge "Fix win_sdk build."

* commit '3130a32fd910f424a9d6b811ed23d9a552004c81':
  Fix win_sdk build.