diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-10-03 11:26:33 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-03 11:26:33 -0700 |
commit | 5001fb6825f38c0e8d9f66535e01df0ed0f6b5c1 (patch) | |
tree | c2351e30a2862752557eef3cff3513c070588c86 | |
parent | ff46ccfa5cf1e16d280843c31a4d0b95ed700d96 (diff) | |
parent | 834ce287666bf5809dc5be5c4b2a481f21fa7901 (diff) | |
download | device_samsung_maguro-5001fb6825f38c0e8d9f66535e01df0ed0f6b5c1.zip device_samsung_maguro-5001fb6825f38c0e8d9f66535e01df0ed0f6b5c1.tar.gz device_samsung_maguro-5001fb6825f38c0e8d9f66535e01df0ed0f6b5c1.tar.bz2 |
am 834ce287: resolved conflicts for merge of 0f2c53e4 to jb-mr1-dev-plus-aosp
* commit '834ce287666bf5809dc5be5c4b2a481f21fa7901':
Distributables for JZO54K for maguro
-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 |