tree f32ad1cdf945bc0319c6a505033aa00ff8605757
parent 86f323b2a73c9c250fbe25b828435aa936704ab3
author Ian Rogers <irogers@google.com> 1461992631 -0700
committer Paul Duffin <paulduffin@google.com> 1482249172 +0000

Extra generic type information to aid certain javacs.

In particular this is needed for the code to compile using the error prone
analyzer.

(cherry picked from 3b8fe889fba29c80db890e0ff58dde9e0a3cc544)

Bug: 27723540
Test: Copied to internal/master and ran error prone build
Change-Id: I5f70f09a189b4ad833a3ea4100eb978abae30849