Jean-Baptiste Queru 1972851d20 Merge korg/donut into korg/master ...

Conflicts:

	tools/eclipse/plugins/README.txt
	tools/sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java

2009-07-25 17:25:52 -07:00

..

.classpath

Merge korg/donut into korg/master

2009-07-25 17:25:52 -07:00

android-formatting.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

android.importorder

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00