Merge commit '8fd9d692aabab8f55f90ab1aa2885c8502534275' into HEAD
Change-Id: I192640a4782329de7ba17082a93ce75aef56a8c4
diff --git a/src/com/google/doclava/Converter.java b/src/com/google/doclava/Converter.java
index 0d4e455..71c7acb 100644
--- a/src/com/google/doclava/Converter.java
+++ b/src/com/google/doclava/Converter.java
@@ -614,7 +614,10 @@
@Override
protected Object keyFor(Object o) {
Type t = (Type) o;
- String keyString = o.getClass().getName() + "/" + o.toString() + "/";
+ while (t.asAnnotatedType() != null) {
+ t = t.asAnnotatedType().underlyingType();
+ }
+ String keyString = t.getClass().getName() + "/" + t.toString() + "/";
if (t.asParameterizedType() != null) {
keyString += t.asParameterizedType().toString() + "/";
if (t.asParameterizedType().typeArguments() != null) {