tree 2e612aebf4f1e17eed3fe50eacec79934cc62dae
parent e325e531e2540c5b35bac38c23e38e327f9926c0
parent 859d9ed5b3fc1b26c2b79bf7b3a956d7d492971b
author Ian Rogers <irogers@google.com> 1462294909 +0000
committer android-build-merger <android-build-merger@google.com> 1462294909 +0000

Merge "Backport: Work around a type inference change in javac" am: a728081e33
am: 859d9ed5b3

* commit '859d9ed5b3fc1b26c2b79bf7b3a956d7d492971b':
  Backport: Work around a type inference change in javac

Change-Id: I20dc71c79ac17115f1993d1c6c22fdab7fb92a07