OSDN Git Service

Merge "Work around a type inference change in javac" am: 517383fcfe am: bf1fb66391...
authorIan Rogers <irogers@google.com>
Tue, 3 May 2016 21:04:06 +0000 (21:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 May 2016 21:04:06 +0000 (21:04 +0000)
am: 1e5fd0b9d3

* commit '1e5fd0b9d34a8f8f94acda8b004d34160b3f732c':
  Work around a type inference change in javac

Change-Id: Ie4409d35a817205a33e5cc4935eb8d7489b3b7b8


Trivial merge