merge from tools_r8

Change-Id: I90eeb2def2e3d3f0ee6f34b0a3f710f966808a7a

diff --cc eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/descriptors/AndroidManifestDescriptors.java
Simple merge

diff --cc eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParser.java
index c3cd89f,d5927f9..9b6675e
--- 1/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParser.java
--- 2/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParser.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParser.java
@@@ -16,12 -16,11 +16,11 @@@
  
  package com.android.ide.eclipse.adt.internal.resources;
  
 +import com.android.ide.common.api.IAttributeInfo.Format;
  import com.android.ide.eclipse.adt.AdtPlugin;
 -import com.android.ide.eclipse.adt.editors.layout.gscripts.IAttributeInfo.Format;
  import com.android.ide.eclipse.adt.internal.editors.descriptors.DescriptorsUtils;
+ import com.android.ide.eclipse.adt.internal.editors.manifest.descriptors.AndroidManifestDescriptors;
  import com.android.ide.eclipse.adt.internal.resources.ViewClassInfo.LayoutParamsInfo;
- import com.android.sdklib.annotations.VisibleForTesting;
- import com.android.sdklib.annotations.VisibleForTesting.Visibility;
  
  import org.eclipse.core.runtime.IStatus;
  import org.w3c.dom.Document;

diff --cc eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserTest.java
index 8662259,cd228ba..ae4837e
--- 1/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserTest.java
--- 2/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/resources/AttrsXmlParserTest.java
@@@ -17,11 -17,9 +17,9 @@@
  package com.android.ide.eclipse.adt.internal.resources;
  
  
 -import com.android.ide.eclipse.adt.editors.layout.gscripts.IAttributeInfo.Format;
 +import com.android.ide.common.api.IAttributeInfo.Format;
  import com.android.ide.eclipse.tests.AdtTestData;
  
- import org.w3c.dom.Document;
- 
  import java.util.Map;
  
  import junit.framework.TestCase;