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:00:21 +0000 (21:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 May 2016 21:00:21 +0000 (21:00 +0000)
am: ceffdb43c5

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

Change-Id: I8dfd4c3511c40a05962d635d22d2c077ceb11cc4


Trivial merge