Mathias Agopian 669084dbe6 resolved conflicts for merge of a0f011ff to master ...

Change-Id: I4c17021fc269ce66c98cc345353600eda332f980

2010-12-07 22:53:40 -08:00

..

android

resolved conflicts for merge of a0f011ff to master

2010-12-07 22:53:40 -08:00

com

Do not attempt to set the minimize heap size in the Zygote.

2010-12-07 17:56:28 -08:00

jarjar-rules.txt

…

overview.html

…