diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-10-03 11:22:41 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-10-03 11:22:41 -0700 |
| commit | 834ce287666bf5809dc5be5c4b2a481f21fa7901 (patch) | |
| tree | c2351e30a2862752557eef3cff3513c070588c86 | |
| parent | bf5faacaebf3e6e87181b3a65f1b8a60976eb6d6 (diff) | |
| parent | 0f2c53e45841fd3f2ef3a5a26a4525392b3d4a58 (diff) | |
| download | device_samsung_maguro-834ce287666bf5809dc5be5c4b2a481f21fa7901.zip device_samsung_maguro-834ce287666bf5809dc5be5c4b2a481f21fa7901.tar.gz device_samsung_maguro-834ce287666bf5809dc5be5c4b2a481f21fa7901.tar.bz2 | |
resolved conflicts for merge of 0f2c53e4 to jb-mr1-dev-plus-aosp
Change-Id: Ib2ccea0895a773aadc09d96cacf119d5c97eed9a
| -rwxr-xr-x | factory-images/generate-factory-images-package.sh | 9 | ||||
| -rwxr-xr-x | self-extractors/generate-packages.sh | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh index b381217..2703e22 100755 --- a/factory-images/generate-factory-images-package.sh +++ b/factory-images/generate-factory-images-package.sh @@ -22,22 +22,23 @@ # 397360 = JRO02C # 398337 = JRO03C # 477516 = JZO54I +# 485486 = JZO54K source ../../../common/clear-factory-images-variables.sh -BUILD=477516 +BUILD=485486 DEVICE=maguro PRODUCT=yakju -VERSION=jzo54i +VERSION=jzo54k SRCPREFIX=signed- BOOTLOADER=primelc03 RADIO=i9250xxlf1 source ../../../common/generate-factory-images-common.sh source ../../../common/clear-factory-images-variables.sh -BUILD=477516 +BUILD=485486 DEVICE=maguro PRODUCT=takju -VERSION=jzo54i +VERSION=jzo54k SRCPREFIX=signed- BOOTLOADER=primelc03 RADIO=i9250xxlf1 diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index b1369bf..881964b 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -35,6 +35,7 @@ # 405518 = JRO03H # 438695 = JRO03R # 463694 = JZO54G +# 485486 = JZO54K # end jb-dev # start jb-mr1-dev # 465036 = JOO75 @@ -47,8 +48,8 @@ then fi # ics-mr1 if test $BRANCH=jb-dev then - ZIP=yakju-ota-463694.zip - BUILD=jzo54g + ZIP=yakju-ota-485486.zip + BUILD=jzo54k fi # jb-dev if test $BRANCH=jb-mr1-dev then |