commit a71fc0a155044be59d7601ecbf333f0d1ad143e4
author The Android Open Source Project <initial-contribution@android.com> Fri Jan 16 14:38:53 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Fri Jan 16 14:38:53 2009 -0800
tree 567a1b0264b3b50dd137eceafc7a11731bee034e
parent 0c2b8bfb87532631e9b3ecd1896ec30c01391b7e
parent 5496ad284d1b78b43d5ac8fd6528cd719ebd7908

Merge branch 'master' of git://android.git.kernel.org/platform/build

tools/droiddoc/src/ClassInfo.java

diff --git a/tools/droiddoc/src/ClassInfo.java b/tools/droiddoc/src/ClassInfo.java
index 36edbf8..2a792c5 100644
--- a/tools/droiddoc/src/ClassInfo.java
+++ b/tools/droiddoc/src/ClassInfo.java
@@ -378,16 +378,8 @@
 
     public TagInfo[] deprecatedTags()
     {
-        TagInfo[] result = comment().deprecatedTags();
-        if (result.length == 0) {
-            if (comment().undeprecateTags().length == 0) {
-                if (superclass() != null) {
-                    result = superclass().deprecatedTags();
-                }
-            }
-        }
-        // should we also do the interfaces?
-        return result;
+        // Should we also do the interfaces?
+        return comment().deprecatedTags();
     }
 
     public MethodInfo[] methods()