tree bbf17c27b57ae50c8b3d1eb23d397e3ce730b849
parent 97eaa6e697336095663649cee27a9e40f097b1db
parent 03c26b274aed35c0a580b309567264d00cb643f2
author Dan Willemsen <dwillemsen@google.com> 1441404026 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441404026 +0000

am 03c26b27: am 596fd38a: Merge "Whitelist windows module"

* commit '03c26b274aed35c0a580b309567264d00cb643f2':
  Whitelist windows module