resolved conflicts for merge of 7464c1fa to jb-dev-plus-aosp

Change-Id: If76931ca5a3046cdfebf9b4e9fcbe638691ca65b
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 70ddbc8..c07cfeb 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -34,6 +34,7 @@
 # 398337 = JRO03C
 # 405518 = JRO03H
 # 438695 = JRO03R
+# 463694 = JZO54G
 # end jb-dev
 BRANCH=jb-dev
 if test $BRANCH=ics-mr1
@@ -43,8 +44,8 @@
 fi # ics-mr1
 if test $BRANCH=jb-dev
 then
-  ZIP=yakju-ota-438695.zip
-  BUILD=jro03r
+  ZIP=yakju-ota-463694.zip
+  BUILD=jzo54g
 fi # jb-dev
 ROOTDEVICE=maguro
 DEVICE=maguro