tree 48b604463b55125e481b7484cfd3b34114e864c4
parent 077e4bb8827a0a055e8d3cf35428c98083b063ab
parent 2ea5b27ef56cb5666dabd09aec2289b3d80ad6ad
author Jean-Baptiste Queru <jbq@google.com> 1329265515 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329265515 -0800

am 2ea5b27e: am 96a4c245: am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""

* commit '2ea5b27ef56cb5666dabd09aec2289b3d80ad6ad':
  Merge "Projects whitelisted for Windows SDK compilation."