tree 20450ddaeccffed3d7254a742f253632088ea102
parent 1dfb5bbe24ccbd127405dc8bb8e178536d1a70b4
parent e6442f26044745627cb13452271ab5cfb171bdf4
author Paul Duffin <paulduffin@google.com> 1486554877 +0000
committer android-build-merger <android-build-merger@google.com> 1486554877 +0000

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

Change-Id: Ice7c16b51eda7dfd8dfed60f1476cdf13286668c