tree 55c194b7018e696d3e011ed7656c0d91f6b65440
parent 5e3009f8d12840e5335eccb577bdea609f66bfd4
parent 5fc83065f6d7f6277cbaa58570c8bfd22456a003
author Dan Willemsen <dwillemsen@google.com> 1441126236 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441126236 +0000

am 5fc83065: am 7bd30b73: Merge "Whitelist windows module"

* commit '5fc83065f6d7f6277cbaa58570c8bfd22456a003':
  Whitelist windows module