tree 08601c884f374b07ade5f6af321b85be127573c3
parent 34af320ed70c67077c43929bf177afa02d59d11a
parent 4868ec8cc28f3cf53c76dd998ba102e096faa1f6
author Dan Albert <danalbert@google.com> 1424883143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424883143 +0000

am 4868ec8c: am a63b7d59: Merge "Fix Windows SDK build."

* commit '4868ec8cc28f3cf53c76dd998ba102e096faa1f6':
  Fix Windows SDK build.