merge from tools_r8

author The Android Open Source Project <initial-contribution@android.com>

Fri, 12 Nov 2010 01:52:26 +0000 (17:52 -0800)

committer The Android Open Source Project <initial-contribution@android.com>

Fri, 12 Nov 2010 01:52:26 +0000 (17:52 -0800)
author The Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 01:52:26 +0000 (17:52 -0800)
committer The Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 01:52:26 +0000 (17:52 -0800)
diff --cc eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
Simple merge
diff --cc eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AndroidConstants.java
Simple merge
author	The Android Open Source Project <initial-contribution@android.com>
	Fri, 12 Nov 2010 01:52:26 +0000 (17:52 -0800)
committer	The Android Open Source Project <initial-contribution@android.com>
	Fri, 12 Nov 2010 01:52:26 +0000 (17:52 -0800)
		1	2
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java	patch \|	diff1 \|	diff2 \|	blob \| history
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AndroidConstants.java	patch \|	diff1 \|	diff2 \|	blob \| history