tree b3c90931d3d486161e7743886420cac7be1251c3
parent 542324f4b48897d40adb010afc440261c599633d
parent 97e1e1704245d4c2edd8a9e155669aaae7341b7d
author Elliott Hughes <enh@google.com> 1416596896 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416596896 +0000

am 97e1e170: Merge "Disable vendor id filtering for OS X."

* commit '97e1e1704245d4c2edd8a9e155669aaae7341b7d':
  Disable vendor id filtering for OS X.