tree c2d671f3c26ceeec2d05bed6569c4179be1fd2ce
parent 710e0265bc5f70398e7c070941ae6af34bf5c5d5
parent ff78e6523189dd179a95309cb9630dab2d9f098d
author Ying Wang <wangying@android.com> 1396321825 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396321825 +0000

am ff78e652: am 9cfefe13: am 6a9f2b12: Merge "Add intel to the vendor whitelist"

* commit 'ff78e6523189dd179a95309cb9630dab2d9f098d':
  Add intel to the vendor whitelist