aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'aosp/l-preview' into cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0Brint E. Kriebel2014-09-29690-5689/+21708
|\
| * am 3fd19dba: (-s ours) Increase the java heap to 512M when running proguardstaging/cm-12.0-cafstaging/cm-12.0Tom Taylor2014-05-150-0/+0
| |\
| | * Increase the java heap to 512M when running proguardTom Taylor2014-05-151-1/+1
| * | resolved conflicts for merge of b005651c to masterNarayan Kamath2013-11-270-0/+0
| |\|
| | * Merge "Upgrade Proguard to 4.10."Narayan Kamath2013-11-26690-5689/+21708
| | |\
| | | * Upgrade Proguard to 4.10.Ying Wang2013-11-26690-5689/+21708
| | |/
| * | Increase the java heap to 512M when running proguard. Otherwise it runs out o...Mike Dodd2013-09-221-1/+1
| * | Upgrade Proguard to 4.10.Ying Wang2013-09-20690-5689/+21708
| |/
* | Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaRicardo Cerqueira2013-11-012-2/+5
|\|
| * Update Retrace Default Regex to Latest VersionAlon Albert2013-06-132-2/+5
* | Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Ricardo Cerqueira2013-07-241-1/+1
|\|
| * increase the java heap to 512M when running proguard. Otherwise the Shem buil...Wei Huang2012-09-041-1/+1
|/
* Revert "Upgrade from Progaurd 4.4 to 4.7."cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingjellybean-stablejellybeancm-10.1Ying Wang2012-02-27651-12435/+4127
* Upgrade from Progaurd 4.4 to 4.7.Ying Wang2012-02-27651-4127/+12435
* am d889ce6d: Merge "Fix proguard wrappers."ics-releaseicscm-9.1.0Raphael Moll2011-05-172-2/+2
|\
| * Merge "Fix proguard wrappers."Raphael Moll2011-05-172-2/+2
| |\
| | * Fix proguard wrappers.Raphael Moll2011-05-092-2/+2
| |/
* / Add missing NOTICE files.David Deephanphongs2010-10-191-0/+367
|/
* Add an empty CleanSpec.mkcm-7.1.0gingerbread-releasegingerbreadgb-release-7.2Jean-Baptiste Queru2010-03-081-0/+49
* am 198fe95b: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\
| * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\
| | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| |/|
| | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-12703-0/+113006
* | | merge from open-source masterThe Android Open Source Project2010-01-210-0/+0
|\ \ \ | |/ / |/| / | |/
| * empty initial commitThe Android Open Source Project2010-01-110-0/+0
* ProGuard 4.4Joe Onorato2009-08-31703-0/+113006
* new project, first commitandroid-build SharedAccount2009-08-310-0/+0