tree 34fd212af2977e84c3a744071a99198171bd0bab
parent a51bfe906e899b3692af1717cc87deffed245f92
parent a471c1b8a417c6c393918315beba1595e43a04a7
author Dan Willemsen <dwillemsen@google.com> 1441126286 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441126286 +0000

am a471c1b8: am 47d70030: Merge "Whitelist windows modules"

* commit 'a471c1b8a417c6c393918315beba1595e43a04a7':
  Whitelist windows modules