external_proguard, branch android-m-preview Unnamed repository; edit this file 'description' to name the repository. am baa6a15c: Merge "Add MODULE_LICENSE file" 2015-03-05T22:19:32+00:00 Conley Owens cco3@android.com 2015-03-05T22:19:32+00:00 ef2942809b198653e0cf181151a5f435f5bb7476 * commit 'baa6a15c85c8ab803b580f3fcbd1eecfbbe9c3a7': Add MODULE_LICENSE file 
* commit 'baa6a15c85c8ab803b580f3fcbd1eecfbbe9c3a7':
  Add MODULE_LICENSE file
Merge "Add MODULE_LICENSE file" 2015-03-05T21:31:13+00:00 Conley Owens cco3@android.com 2015-03-05T21:31:12+00:00 baa6a15c85c8ab803b580f3fcbd1eecfbbe9c3a7 






Add MODULE_LICENSE file
2015-03-04T01:13:15+00:00

Conley Owens
cco3@android.com

2015-03-04T01:13:15+00:00

4857a1a58b19effde44bd39a3b62c3c239b1838c

Change-Id: Ia519f00065573092f0ef3e8ab8ce88258bd1ae86





Change-Id: Ia519f00065573092f0ef3e8ab8ce88258bd1ae86







am 6af8f100: Merge "Upgrade Proguard to 5.1."
2015-01-09T02:03:40+00:00

Brian Carlstrom
bdc@google.com

2015-01-09T02:03:40+00:00

d7ee0a7df8e2b657290a597978953cd691eba9b1

* commit '6af8f1004e0efe02a138286a34e833d1f3d227d7':
  Upgrade Proguard to 5.1.





* commit '6af8f1004e0efe02a138286a34e833d1f3d227d7':
  Upgrade Proguard to 5.1.







Merge "Upgrade Proguard to 5.1."
2015-01-09T00:45:23+00:00

Brian Carlstrom
bdc@google.com

2015-01-09T00:45:23+00:00

6af8f1004e0efe02a138286a34e833d1f3d227d7












Upgrade Proguard to 5.1.
2015-01-08T18:29:11+00:00

Brian Carlstrom
bdc@google.com

2015-01-08T16:24:06+00:00

cd9e071098d0539dda3a4a5d3f45cfd8814de4ed

Downloaded from:
http://sourceforge.net/projects/proguard/files/proguard/5.1/

Bug: 17550647

(cherry picked from commit 2270795fbe0b277bfd49f40950ecaa78583175cc)

Change-Id: I4d4c6b4f11aca8d5595b7f285c675bc5873d5e24





Downloaded from:
http://sourceforge.net/projects/proguard/files/proguard/5.1/

Bug: 17550647

(cherry picked from commit 2270795fbe0b277bfd49f40950ecaa78583175cc)

Change-Id: I4d4c6b4f11aca8d5595b7f285c675bc5873d5e24







Upgrade Proguard to 5.1.
2015-01-08T17:27:15+00:00

Brian Carlstrom
bdc@google.com

2015-01-08T16:24:06+00:00

2270795fbe0b277bfd49f40950ecaa78583175cc

Downloaded from:
http://sourceforge.net/projects/proguard/files/proguard/5.1/

Bug: 17550647
Change-Id: I2b4eab16eb7821fc232b294ab7f433aae08f71e1





Downloaded from:
http://sourceforge.net/projects/proguard/files/proguard/5.1/

Bug: 17550647
Change-Id: I2b4eab16eb7821fc232b294ab7f433aae08f71e1







am 3fd19dba: (-s ours) Increase the java heap to 512M when running proguard
2014-05-15T20:26:29+00:00

Tom Taylor
tomtaylor@google.com

2014-05-15T20:26:29+00:00

9961286c06c25cd03464d3e2b00bd9b9dedf96ba

* commit '3fd19dba2bdc0c4b64afda4d75836e1dcf7abf97':
  Increase the java heap to 512M when running proguard





* commit '3fd19dba2bdc0c4b64afda4d75836e1dcf7abf97':
  Increase the java heap to 512M when running proguard







Increase the java heap to 512M when running proguard
2014-05-15T20:10:07+00:00

Tom Taylor
tomtaylor@google.com

2014-05-15T20:10:07+00:00

3fd19dba2bdc0c4b64afda4d75836e1dcf7abf97

All of us building on Macs are running out of java heapspace during the
proguard phase of the build. This CL fixes the problem.

Change-Id: I461bb14b2ff2491e43ef8e2312e76a2a8fc0ee24





All of us building on Macs are running out of java heapspace during the
proguard phase of the build. This CL fixes the problem.

Change-Id: I461bb14b2ff2491e43ef8e2312e76a2a8fc0ee24







resolved conflicts for merge of b005651c to master
2013-11-27T18:15:59+00:00

Narayan Kamath
narayan@google.com

2013-11-27T18:15:59+00:00

232e3406f76b7ad2c869a3c10b498556dbcf747a

Change-Id: I727039a1eb945a438432d5bab078379a27854c8f





Change-Id: I727039a1eb945a438432d5bab078379a27854c8f