am 28fc4830: Merge "Cleanup leftover merge conflict"android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-release

* commit '28fc4830fdc68db134783955cc9f54f32d35b0fd':
  Cleanup leftover merge conflict

2 files changed, 0 insertions, 15 deletions

diff --git a/javadoc/javax/annotation/meta/Exclusive.html b/javadoc/javax/annotation/meta/Exclusive.html
index 042dc7e..653d25b 100644
--- a/javadoc/javax/annotation/meta/Exclusive.html
+++ b/javadoc/javax/annotation/meta/Exclusive.html
@@ -101,13 +101,6 @@ This annotation can be applied to the value() element of an annotation that
  For example, the following defines a type qualifier such that if you know a
  value is @Foo(1), then the value cannot be @Foo(2) or {@Foo(3).
  
-<<<<<<< .mine
- For example, the following defines a type qualifier such that if you know
- a value is  &amp;#064;Foo(1), then the value cannot be &amp;#064;Foo(2) 
- or {&amp;#064;Foo(3).
-  
-=======
->>>>>>> .r47
  <code>
  &#064;TypeQualifier &#064;interface Foo {
      &#064;Exclusive int value();
diff --git a/javadoc/javax/annotation/meta/Exhaustive.html b/javadoc/javax/annotation/meta/Exhaustive.html
index 1cdf1b4..e0feb16 100644
--- a/javadoc/javax/annotation/meta/Exhaustive.html
+++ b/javadoc/javax/annotation/meta/Exhaustive.html
@@ -102,20 +102,12 @@ This annotation can be applied to the value() element of an annotation that
  Applications of the type qualifier with different values are exclusive, and
  the enumeration is an exhaustive list of the possible values.
  
-<<<<<<< .mine
- For example, the following defines a type qualifier such that if you know
- a value is neither &amp;#064;Foo(Color.Red) or &amp;#064;Foo(Color.Blue), then the value must be
- &amp;#064;Foo(Color.Green). And if you know it is &amp;#064;Foo(Color.Green), you know it cannot
- be &amp;#064;Foo(Color.Red) or &amp;#064;Foo(Color.Blue)
-  
-=======
  For example, the following defines a type qualifier such that if you know a
  value is neither @Foo(Color.Red) or @Foo(Color.Blue),
  then the value must be @Foo(Color.Green). And if you know it is
  @Foo(Color.Green), you know it cannot be
  @Foo(Color.Red) or @Foo(Color.Blue)
  
->>>>>>> .r47
  <code>
  &#064;TypeQualifier  @interface Foo {
      enum Color {RED, BLUE, GREEN};