tree 34fd212af2977e84c3a744071a99198171bd0bab
parent 80aa64833c352aebdc2c9d533289e072d263cf04
parent 47d70030a603d359a89e06392415876f71756c0e
author Dan Willemsen <dwillemsen@google.com> 1441125423 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441125423 +0000

am 47d70030: Merge "Whitelist windows modules"

* commit '47d70030a603d359a89e06392415876f71756c0e':
  Whitelist windows modules