From b0769f0182c6ce24f436bce6c75f691a512a0504 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 28 Mar 2012 09:29:13 -0700
Subject: organize scripts with per-version sections to avoid merge conflicts

Change-Id: Ieb452fa5e3a04cdab475beb69a558ba0591713e1
---
 self-extractors/generate-packages.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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
-- 
cgit v1.1