diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-23 16:43:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-23 16:43:14 -0700 |
| commit | 55e7e8ac6bf34c75461f416b0a8249b023318872 (patch) | |
| tree | 2ae7753b9cbb2c6c0afe306c2fefa342f7efdc72 | |
| parent | 6026dc7ec6103182fb2a40fc03e9d6eb5fe94c2a (diff) | |
| parent | 5a2fc9c912510c65504a548f2b26328d11017059 (diff) | |
| download | libcore-55e7e8ac6bf34c75461f416b0a8249b023318872.zip libcore-55e7e8ac6bf34c75461f416b0a8249b023318872.tar.gz libcore-55e7e8ac6bf34c75461f416b0a8249b023318872.tar.bz2 | |
am 5a2fc9c9: am 4323ab38: Merge "Simplify merges of the annotation code."
* commit '5a2fc9c912510c65504a548f2b26328d11017059':
Simplify merges of the annotation code.
| -rw-r--r-- | luni/src/main/java/libcore/reflect/AnnotationFactory.java (renamed from libdvm/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java) | 2 | ||||
| -rw-r--r-- | luni/src/main/java/libcore/reflect/AnnotationMember.java (renamed from libdvm/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libdvm/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java b/luni/src/main/java/libcore/reflect/AnnotationFactory.java index 5fe0740..c4e6802 100644 --- a/libdvm/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java +++ b/luni/src/main/java/libcore/reflect/AnnotationFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.harmony.lang.annotation; +package libcore.reflect; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/libdvm/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java b/luni/src/main/java/libcore/reflect/AnnotationMember.java index f64332a..7ca4abf 100644 --- a/libdvm/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java +++ b/luni/src/main/java/libcore/reflect/AnnotationMember.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.harmony.lang.annotation; +package libcore.reflect; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -45,13 +45,13 @@ import java.util.Arrays; * class-data structures and throwing is delayed until the element * is requested for value. * - * @see android.lang.annotation.AnnotationFactory + * @see AnnotationFactory * * @author Alexey V. Varlamov, Serguei S. Zapreyev * @version $Revision$ */ @SuppressWarnings({"serial"}) -public class AnnotationMember implements Serializable { +public final class AnnotationMember implements Serializable { /** * Tag description of a Throwable value type. |