tree 53af80c6dcc9f8bd3f9f77d36a94f47da8e1b3b4
parent b9088471fe0d93448d2fdca892ec62d2dcffa93c
parent 0b68dc75ecead4c11ba272b1311301cb601cf084
author Dan Willemsen <dwillemsen@google.com> 1441240775 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441240775 +0000

am 0b68dc75: am 0acdcd16: Merge "Stop using HOST_OS, whitelist windows modules"

* commit '0b68dc75ecead4c11ba272b1311301cb601cf084':
  Stop using HOST_OS, whitelist windows modules