tree 2604b3c2f1470d2089f75386de3e8686c064e1ac
parent 85b58148c92cd9c79138d2dad487c50c6d26732f
parent 84363e91550985b80116a906c49fa150743c58b1
author Dan Willemsen <dwillemsen@google.com> 1441126237 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441126237 +0000

am 84363e91: am 316ed876: Merge "Whitelist windows modules"

* commit '84363e91550985b80116a906c49fa150743c58b1':
  Whitelist windows modules