tree 742874a9f887148d701bdd430077c34db5defd4f
parent 81aee27c60ad3feb570bdb5e981b34bff7c913db
parent 2263c12e056d103ca0138c75f09340f18b31c04e
author Christoffer Quist Adamsen <christofferqa@google.com> 1529479148 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1529479148 +0000

Merge "Prevent class merging from hiding IncompatibleClassChangeErrors"