merge from tools_r8

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

Wed, 27 Oct 2010 17:23:20 +0000 (10:23 -0700)

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

Wed, 27 Oct 2010 17:23:20 +0000 (10:23 -0700)
author The Android Open Source Project <initial-contribution@android.com>
Wed, 27 Oct 2010 17:23:20 +0000 (10:23 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Wed, 27 Oct 2010 17:23:20 +0000 (10:23 -0700)
diff --cc eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/descriptors/AndroidManifestDescriptors.java
Simple merge
author	The Android Open Source Project <initial-contribution@android.com>
	Wed, 27 Oct 2010 17:23:20 +0000 (10:23 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Wed, 27 Oct 2010 17:23:20 +0000 (10:23 -0700)