summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2010-12-08 19:13:34 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-08 19:13:34 -0800
commit2095a6d63b5b773030732b86aa44ba9ee52a04cc (patch)
tree5e8ea3207b12c37e2fc7117d61d3a23157954aaa
parent279d34f4b26caf77e5dde2f7cbe3d286ac54dda6 (diff)
parent75cfba9cc3cd20357324822e57d303aa75c9ebcf (diff)
downloadframeworks_base-2095a6d63b5b773030732b86aa44ba9ee52a04cc.zip
frameworks_base-2095a6d63b5b773030732b86aa44ba9ee52a04cc.tar.gz
frameworks_base-2095a6d63b5b773030732b86aa44ba9ee52a04cc.tar.bz2
Merge "Make doclava happy by returning the same type in old and new APIs."
-rw-r--r--api/11.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/11.xml b/api/11.xml
index 368bfc8..0edb67c 100644
--- a/api/11.xml
+++ b/api/11.xml
@@ -247155,7 +247155,7 @@
</exception>
</method>
<method name="getClass"
- return="java.lang.Class&lt;? extends java.lang.Object&gt;"
+ return="java.lang.Class&lt;?&gt;"
abstract="false"
native="true"
synchronized="false"