diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-03-28 10:13:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-28 10:13:13 -0700 |
commit | 4397a756525f25a9856de35951feb2cfc99171a0 (patch) | |
tree | b763ee0f32b989246adcd97eaf0bcabd7b601088 | |
parent | 200312ceb6315fe67979232cd46526c93e449109 (diff) | |
parent | c92cd91e886a78796457d61073c1b60372865fbd (diff) | |
download | stingray-4397a756525f25a9856de35951feb2cfc99171a0.tar.gz |
am c92cd91e: am cdb6b46b: organize scripts with per-version sections to avoid merge conflictsandroid-cts-4.1_r1
* commit 'c92cd91e886a78796457d61073c1b60372865fbd':
organize scripts with per-version sections to avoid merge conflicts
-rwxr-xr-x | self-extractors/generate-packages.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index faeb3df..80ce27e 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -23,8 +23,13 @@ # 239410 = IML74K # 262866 = IMM30D # 299849 = IMM76D -ZIP=trygon-ota-299849.zip -BUILD=imm76d +# end ics-mr1 +BRANCH=ics-mr1 +if test $BRANCH=ics-mr1 +then + ZIP=trygon-ota-299849.zip + BUILD=imm76d +fi ROOTDEVICE=stingray DEVICE=stingray MANUFACTURER=moto |