commit 3729423f5219d9821211c3c3f44c5600f023f3cd
author Jean-Baptiste Queru <jbq@google.com> Wed Mar 28 09:47:10 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 28 09:47:10 2012 -0700
tree cd4d6964854b5c6e8e64ea49fa71d41b05fd4c53
parent 89b566ac9fc460c0cb7d75cc0ebd6c0ec0db3e36
parent 2a544301a2454b7c5a18e8028430a6b13ded0d89

am 2a544301: am 5cd7e86d: organize scripts with per-version sections to avoid merge conflicts

* commit '2a544301a2454b7c5a18e8028430a6b13ded0d89':
  organize scripts with per-version sections to avoid merge conflicts

self-extractors/generate-packages.sh

diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index e671a2e..1a99385 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -37,8 +37,13 @@
 # 257829 = IMM30B
 # 262866 = IMM30D
 # 299849 = IMM76D
-ZIP=soju-ota-299849.zip
-BUILD=imm76d
+# end ics-mr1
+BRANCH=ics-mr1
+if test $BRANCH=ics-mr1
+then
+  ZIP=soju-ota-299849.zip
+  BUILD=imm76d
+fi # ics-mr1
 ROOTDEVICE=crespo
 DEVICE=crespo
 MANUFACTURER=samsung