tree a83570202c27bef31f026c416070a87c8746893b
parent f31b2fcfcfba4a5c6d13a4a2147567c08c72b034
parent 0a780cb8b9de02975a556837a88de6ad1b9b19a0
author Ian Rogers <irogers@google.com> 1462295549 +0000
committer android-build-merger <android-build-merger@google.com> 1462295549 +0000

Merge "Extra generic type information to aid certain javacs." am: 9a62c01586
am: 0a780cb8b9

* commit '0a780cb8b9de02975a556837a88de6ad1b9b19a0':
  Extra generic type information to aid certain javacs.

Change-Id: I088d7743f128e61fae7c0f7291a455b7146cd712