tree 20450ddaeccffed3d7254a742f253632088ea102
parent 05e68aaf5378b155cc99e7c2b8b87de92011c5ce
parent a7b13a9be885f7471bd449ddaa57ff7a92114c0b
author Paul Duffin <paulduffin@google.com> 1486555014 +0000
committer android-build-merger <android-build-merger@google.com> 1486555014 +0000

Merge "Temporarily add void is(Class) to cause compile time errors" am: 21a7b5b68f am: f019c17e68 am: e6442f2604
am: a7b13a9be8

Change-Id: I4e29972dddb17dd667623ba1d9383c80f8b90fc8