commit 828df0977d111e959e03d2886cced2d38b6ebbc1
author The Android Open Source Project <initial-contribution@android.com> Sun Jun 16 07:43:55 2013 -0700
committer The Android Open Source Project <initial-contribution@android.com> Sun Jun 16 07:43:55 2013 -0700
tree 5f6993a00974e3d8585c7b9b2d31902e6ad01f06
parent 97342f49002d2d97f11e0105a2aff25782d9f4ac
parent 6976c3853afd70a7b4fd7a3330823c774c604e66

Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ia2af8d01edfb1b4d7a1c9cd5f1822a971294e707

factory-images/generate-factory-images-package.sh

diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
index 7cea588..dba5360 100755
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2011 The Android Open Source Project
+# Copyright 2011 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.
@@ -22,14 +22,18 @@
 # 398337 = JRO03C
 # 424425 = JRO03O
 # 573038 = JDQ39
+# 683083 = JWR51
+# 689345 = JWR58
+# 690834 = JWR59
+# 704243 = JWR59
 
 source ../../../common/clear-factory-images-variables.sh
 PRODUCT=mysid
 DEVICE=toro
-BUILD=573038
-VERSION=jdq39
+BUILD=704243
+VERSION=jwr66g
 SRCPREFIX=signed-
-BOOTLOADER=primelc03
+BOOTLOADER=primemd04
 RADIO=i515.fk02
 CDMARADIO=i515.fk01
 source ../../../common/generate-factory-images-common.sh

self-extractors/generate-packages.sh

diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index f4788e4..db875c9 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2010 The Android Open Source Project
+# Copyright 2010 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.
@@ -47,7 +47,20 @@
 # 551245 = JDP82
 # 573038 = JDQ39
 # end jb-mr1.1-dev
-BRANCH=jb-mr1.1-dev
+# start jb-mr2-dev
+# 681336 = JWR50
+# 683083 = JWR51
+# 684634 = JWR52
+# 686185 = JWR53
+# 689345 = JWR58
+# 690834 = JWR59
+# 692263 = JWR60
+# 695489 = JWR64
+# 699533 = JWR66
+# 701448 = JWR66C
+# 704243 = JWR66G
+# end jb-mr2-dev
+BRANCH=jb-mr2-dev
 if test $BRANCH = ics-mr1
 then
   ZIP=mysid-ota-299849.zip
@@ -58,7 +71,7 @@
   ZIP=mysid-ota-485486.zip
   BUILD=jzo54k
 fi # jb-dev
-if test $BRANCHi = jb-mr1-dev
+if test $BRANCH = jb-mr1-dev
 then
   ZIP=mysid-ota-527662.zip
   BUILD=jop40c
@@ -68,6 +81,11 @@
   ZIP=mysid-ota-573038
   BUILD=jdq39
 fi # jb-mr1.1-dev
+if test $BRANCH = jb-mr2-dev
+then
+  ZIP=mysid-ota-704243
+  BUILD=jwr66g
+fi # jb-mr2ev
 ROOTDEVICE=toro
 DEVICE=toro
 MANUFACTURER=samsung