Import patches-unapplied version 2.221 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 174d0f4b50

New changelog entries:
  * Adding android_nvram group to the touch image

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.221) utopic; urgency=medium
+
+  * Adding android_nvram group to the touch image
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>  Mon, 30 Jun 2014 00:12:43 +0400
+
 livecd-rootfs (2.220) utopic; urgency=medium
 
   [ Alfonso Sanchez-Beato (email Canonical) ]

live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot

@@ -2,7 +2,7 @@
 
 USER=phablet
 
-DEFGROUPS="tty,sudo,adm,dialout,cdrom,plugdev,audio,dip,video,gps,radio,bluetooth,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw,android_media"
+DEFGROUPS="tty,sudo,adm,dialout,cdrom,plugdev,audio,dip,video,gps,radio,bluetooth,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw,android_media,android_nvram"
 
 /bin/egrep  -i "^audio:" /etc/group
 if [ $? -eq 0 ]; then
@@ -79,10 +79,17 @@ else
 fi
 /bin/egrep -i "^android_media:" /etc/group
 if [ $? -eq 0 ]; then
- echo "User android_media exists in /etc/group"
+	echo "User android_media exists in /etc/group"
 else
- echo "User android_media does not exist in /etc group -- must create"
+	echo "User android_media does not exist in /etc group -- must create"
- groupadd -g 1013 android_media
+	groupadd -g 1013 android_media
+fi
+/bin/egrep -i "^android_nvram:" /etc/group
+if [ $? -eq 0 ]; then
+	echo "User android_nvram exists in /etc/group"
+else
+	echo "User android_nvram does not exist in /etc group -- must create"
+	groupadd -g 9997 android_nvram
 fi
 
 echo "I: add $USER to ($DEFGROUPS) groups"