OSDN Git Service

merge from tools_r8
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 28 Oct 2010 00:44:31 +0000 (17:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 28 Oct 2010 00:44:31 +0000 (17:44 -0700)
commit4320a9674c602f70400e694bdda70e7bb5796fee
treed2bceb8fb9259e1ae8c8e23b41b6da6b86188b85
parentec48798fe27bb21967738c7bcd307e3650fb217a
parent7fe4b7b04a46c13355509559d88bad24fcc6a5dc
merge from tools_r8

Change-Id: I90eeb2def2e3d3f0ee6f34b0a3f710f966808a7a
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/descriptors/AndroidManifestDescriptors.java
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParser.java
eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserTest.java