tree e66f18b13614f6c119e3f95415becac68d7dbf85
parent 01f93e59554021df65c7e74c5ecf428803bd73fc
parent 8b0ab0a6c33816485acf4a9a1864d5e4fd645ce2
author Andrew Hsieh <andrewhsieh@google.com> 1403107855 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403107855 +0000

am 8b0ab0a6: Merge "Fix Windows SDK build."

* commit '8b0ab0a6c33816485acf4a9a1864d5e4fd645ce2':
  Fix Windows SDK build.