tree b8ef734014c9ad29eddae36edfb9857fc2e540d7
parent eaec48c8641843b8b75370ef6f41b32c5bc8bfbf
author Julian Odell <juliano@google.com> 1475096145 -0700
committer Michael Wright <michaelwr@google.com> 1475150059 +0000

Fix collisions due to ignoring outer class names.

Second attempt - this time strip the type parameters from
the class name but keep the qualified token name (which
will include both Outer and Inner class names so
OuterClass1.InnerClass<V> will become OuterClass1.InnerClass
rather than just InnerClass).

See b/31775016.

Change-Id: Ib2465cc33006e086ab66a6e8e307e98ff1dc37e5
(cherry picked from commit cbc19f92af1b7cef2c2b2d1d3c2cdd12ce27b290)