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

author Ying Wang <wangying@android.com>

Tue, 1 Apr 2014 03:05:06 +0000 (03:05 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Tue, 1 Apr 2014 03:05:06 +0000 (03:05 +0000)
author Ying Wang <wangying@android.com>
Tue, 1 Apr 2014 03:05:06 +0000 (03:05 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 1 Apr 2014 03:05:06 +0000 (03:05 +0000)
diff --cc core/tasks/vendor_module_check.mk

index 1b4cc43,6e18901..99d3d9e
--- 1/core/tasks/vendor_module_check.mk
--- 2/core/tasks/vendor_module_check.mk
+++ b/core/tasks/vendor_module_check.mk
@@@ -22,9 -22,9 +22,10 @@@ _vendor_owner_whitelist := 
           csr \
           elan \
           google \
+ +        htc \
           imgtec \
           invensense \
+         intel \
           lge \
           nvidia \
           nxp \
author	Ying Wang <wangying@android.com>
	Tue, 1 Apr 2014 03:05:06 +0000 (03:05 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 1 Apr 2014 03:05:06 +0000 (03:05 +0000)