tree 55c194b7018e696d3e011ed7656c0d91f6b65440
parent 16767df804698551950506f8d628a0f6a28bb22f
parent 7bd30b73c2aaf996ebb30f1dcc8765e329bddaab
author Dan Willemsen <dwillemsen@google.com> 1441125462 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441125462 +0000

am 7bd30b73: Merge "Whitelist windows module"

* commit '7bd30b73c2aaf996ebb30f1dcc8765e329bddaab':
  Whitelist windows module