tree 47c7ae7791e21a6120e4ddd01ce516df3a39a42d
parent 6dfe949568fa9413db72cdccb26baca2c4592a2a
parent ed1a0dbd43ba81c3f1cb723c0e4fa5ca2807d473
author Dan Albert <danalbert@google.com> 1402652546 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402652546 +0000

am ed1a0dbd: am b44e626c: Merge "Fix windows sdk build."

* commit 'ed1a0dbd43ba81c3f1cb723c0e4fa5ca2807d473':
  Fix windows sdk build.