tree c899f49db2340c03ca66fadd7baba347107946a5
parent 4c487171fb0717f0a5223178d9a1e542fe0265a1
parent 35e0d1defab101925cdbe1490050989f2b813ac1
author Julian Odell <juliano@google.com> 1475600907 +0000
committer android-build-merger <android-build-merger@google.com> 1475600907 +0000

Fix collisions due to ignoring outer class names.
am: 35e0d1defa

Change-Id: Id5483a849b7b561079f36470711c87f98785d2e2