Make match more strict

This helps reduce false matches for short company names

BUG: 16463358

Change-Id: I032da8fa018fa453b054e2828cedab14e78a1a7a
diff --git a/generate-packages.sh b/generate-packages.sh
index 96d07ef..070dfd0 100755
--- a/generate-packages.sh
+++ b/generate-packages.sh
@@ -41,7 +41,7 @@
   mkdir -p $FILEDIR
   mkdir -p tmp/vendor/$MANUFACTURER/$ROOTDEVICE
 
-  TO_EXTRACT=`sed -n -e '/'"$COMPANY"'/,/;;/ p' $EXTRACT_LIST_FILENAME | tail -n+3 | head -n-2 | sed -e 's/\\\//g'`
+  TO_EXTRACT=`sed -n -e '/'"  $COMPANY"'/,/;;/ p' $EXTRACT_LIST_FILENAME | tail -n+3 | head -n-2 | sed -e 's/\\\//g'`
 
   echo \ \ Extracting files from OTA package
   for ONE_FILE in $TO_EXTRACT
diff --git a/populate-new-device.sh b/populate-new-device.sh
index 90ab783..09bfd8d 100755
--- a/populate-new-device.sh
+++ b/populate-new-device.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2013 The Android Open Source Project
+# Copyright 2014 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 
 cat > device/$1/$2/vendorsetup.sh << EOF
 #
-# Copyright 2013 The Android Open Source Project
+# Copyright 2014 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@
 
 cat > device/$1/$2/AndroidProducts.mk << EOF
 #
-# Copyright 2013 The Android Open-Source Project
+# Copyright 2014 The Android Open-Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@
 
 cat > device/$1/$2/full_$2.mk << EOF
 #
-# Copyright 2013 The Android Open-Source Project
+# Copyright 2014 The Android Open-Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -92,7 +92,7 @@
 
 cat > device/$1/$2/device.mk << EOF
 #
-# Copyright 2013 The Android Open-Source Project
+# Copyright 2014 The Android Open-Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -121,7 +121,7 @@
 
 cat > device/$1/$2/BoardConfig.mk << EOF
 #
-# Copyright 2013 The Android Open-Source Project
+# Copyright 2014 The Android Open-Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -150,7 +150,7 @@
 
 cat > vendor/$1/$2/device-vendor.mk << EOF
 #
-# Copyright 2013 The Android Open-Source Project
+# Copyright 2014 The Android Open-Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -168,7 +168,7 @@
 
 cat > vendor/$1/$2/BoardConfigVendor.mk << EOF
 #
-# Copyright 2013 The Android Open-Source Project
+# Copyright 2014 The Android Open-Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.