tree 055579d4fec16888fc25163fc6b0f979621c805a
parent 9326558a612aabd86da18f1834a448b3291851de
parent 4888b8ef094d457f4eec9ee2c4a92be5dc1aa847
author Dan Willemsen <dwillemsen@google.com> 1441127131 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441127131 +0000

am 4888b8ef: am 5fc83065: am 7bd30b73: Merge "Whitelist windows module"

* commit '4888b8ef094d457f4eec9ee2c4a92be5dc1aa847':
  Whitelist windows module