tree 7222426c3b49a87e4c85f36a44d328a90ae2a252
parent 304c80705867d34b3323350a2cf0412e2931f6d0
parent 4a5687a7144a60826b6fc035459fd691705b72bc
author Raphael Moll <ralf@android.com> 1399144325 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399144325 +0000

am 4a5687a7: (-s ours) Merge "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."

* commit '4a5687a7144a60826b6fc035459fd691705b72bc':
  win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.