tree 2604b3c2f1470d2089f75386de3e8686c064e1ac
parent d7eb96c5b47d693c40c8c744f77f9c45ac3188b8
parent 316ed876bc5be0f5c67493ae37afc140fe07c0f2
author Dan Willemsen <dwillemsen@google.com> 1441125421 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441125421 +0000

am 316ed876: Merge "Whitelist windows modules"

* commit '316ed876bc5be0f5c67493ae37afc140fe07c0f2':
  Whitelist windows modules